1
0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00

Removed dependency on common config header

This commit is contained in:
narzoul 2022-12-12 23:35:51 +01:00
parent 89a16d92e8
commit 97197dde6a
63 changed files with 164 additions and 105 deletions

View File

@ -1,4 +1,37 @@
#include <Config/Config.h>
#include <Config/Settings/AlignSysMemSurfaces.h>
#include <Config/Settings/AlternatePixelCenter.h>
#include <Config/Settings/AltTabFix.h>
#include <Config/Settings/Antialiasing.h>
#include <Config/Settings/BltFilter.h>
#include <Config/Settings/ConfigHotKey.h>
#include <Config/Settings/CpuAffinity.h>
#include <Config/Settings/CpuAffinityRotation.h>
#include <Config/Settings/DesktopColorDepth.h>
#include <Config/Settings/DisplayFilter.h>
#include <Config/Settings/DisplayRefreshRate.h>
#include <Config/Settings/DisplayResolution.h>
#include <Config/Settings/DpiAwareness.h>
#include <Config/Settings/FontAntialiasing.h>
#include <Config/Settings/ForceD3D9On12.h>
#include <Config/Settings/FpsLimiter.h>
#include <Config/Settings/FullscreenMode.h>
#include <Config/Settings/LogLevel.h>
#include <Config/Settings/PalettizedTextures.h>
#include <Config/Settings/RemoveBorders.h>
#include <Config/Settings/RenderColorDepth.h>
#include <Config/Settings/ResolutionScale.h>
#include <Config/Settings/ResolutionScaleFilter.h>
#include <Config/Settings/SoftwareDevice.h>
#include <Config/Settings/SpriteDetection.h>
#include <Config/Settings/SpriteFilter.h>
#include <Config/Settings/SpriteTexCoord.h>
#include <Config/Settings/StatsHotKey.h>
#include <Config/Settings/SupportedResolutions.h>
#include <Config/Settings/TerminateHotKey.h>
#include <Config/Settings/TextureFilter.h>
#include <Config/Settings/ThreadPriorityBoost.h>
#include <Config/Settings/VSync.h>
#include <Config/Settings/WinVersionLie.h>
namespace Config
{

View File

@ -1,74 +0,0 @@
#pragma once
#include <Config/Settings/AlignSysMemSurfaces.h>
#include <Config/Settings/AlternatePixelCenter.h>
#include <Config/Settings/AltTabFix.h>
#include <Config/Settings/Antialiasing.h>
#include <Config/Settings/BltFilter.h>
#include <Config/Settings/ConfigHotKey.h>
#include <Config/Settings/CpuAffinity.h>
#include <Config/Settings/CpuAffinityRotation.h>
#include <Config/Settings/DesktopColorDepth.h>
#include <Config/Settings/DisplayFilter.h>
#include <Config/Settings/DisplayRefreshRate.h>
#include <Config/Settings/DisplayResolution.h>
#include <Config/Settings/DpiAwareness.h>
#include <Config/Settings/FontAntialiasing.h>
#include <Config/Settings/ForceD3D9On12.h>
#include <Config/Settings/FpsLimiter.h>
#include <Config/Settings/FullscreenMode.h>
#include <Config/Settings/LogLevel.h>
#include <Config/Settings/PalettizedTextures.h>
#include <Config/Settings/RemoveBorders.h>
#include <Config/Settings/RenderColorDepth.h>
#include <Config/Settings/ResolutionScale.h>
#include <Config/Settings/ResolutionScaleFilter.h>
#include <Config/Settings/SoftwareDevice.h>
#include <Config/Settings/SpriteDetection.h>
#include <Config/Settings/SpriteFilter.h>
#include <Config/Settings/SpriteTexCoord.h>
#include <Config/Settings/StatsHotKey.h>
#include <Config/Settings/SupportedResolutions.h>
#include <Config/Settings/TerminateHotKey.h>
#include <Config/Settings/TextureFilter.h>
#include <Config/Settings/ThreadPriorityBoost.h>
#include <Config/Settings/VSync.h>
#include <Config/Settings/WinVersionLie.h>
namespace Config
{
extern Settings::AlignSysMemSurfaces alignSysMemSurfaces;
extern Settings::AlternatePixelCenter alternatePixelCenter;
extern Settings::AltTabFix altTabFix;
extern Settings::Antialiasing antialiasing;
extern Settings::BltFilter bltFilter;
extern Settings::ConfigHotKey configHotKey;
extern Settings::CpuAffinity cpuAffinity;
extern Settings::CpuAffinityRotation cpuAffinityRotation;
extern Settings::DesktopColorDepth desktopColorDepth;
extern Settings::DisplayFilter displayFilter;
extern Settings::DisplayRefreshRate displayRefreshRate;
extern Settings::DisplayResolution displayResolution;
extern Settings::DpiAwareness dpiAwareness;
extern Settings::FontAntialiasing fontAntialiasing;
extern Settings::ForceD3D9On12 forceD3D9On12;
extern Settings::FpsLimiter fpsLimiter;
extern Settings::FullscreenMode fullscreenMode;
extern Settings::LogLevel logLevel;
extern Settings::PalettizedTextures palettizedTextures;
extern Settings::RemoveBorders removeBorders;
extern Settings::RenderColorDepth renderColorDepth;
extern Settings::ResolutionScale resolutionScale;
extern Settings::ResolutionScaleFilter resolutionScaleFilter;
extern Settings::SoftwareDevice softwareDevice;
extern Settings::SpriteDetection spriteDetection;
extern Settings::SpriteFilter spriteFilter;
extern Settings::SpriteTexCoord spriteTexCoord;
extern Settings::StatsHotKey statsHotKey;
extern Settings::SupportedResolutions supportedResolutions;
extern Settings::TerminateHotKey terminateHotKey;
extern Settings::TextureFilter textureFilter;
extern Settings::ThreadPriorityBoost threadPriorityBoost;
extern Settings::VSync vSync;
extern Settings::WinVersionLie winVersionLie;
}

View File

@ -15,4 +15,6 @@ namespace Config
}
};
}
extern Settings::AlignSysMemSurfaces alignSysMemSurfaces;
}

View File

@ -21,4 +21,6 @@ namespace Config
}
};
}
extern Settings::AltTabFix altTabFix;
}

View File

@ -15,4 +15,6 @@ namespace Config
}
};
}
extern Settings::AlternatePixelCenter alternatePixelCenter;
}

View File

@ -14,4 +14,6 @@ namespace Config
virtual ParamInfo getParamInfo() const override;
};
}
extern Settings::Antialiasing antialiasing;
}

View File

@ -18,4 +18,6 @@ namespace Config
}
};
}
extern Settings::BltFilter bltFilter;
}

View File

@ -12,4 +12,6 @@ namespace Config
ConfigHotKey() : HotKeySetting("ConfigHotKey", "shift+f11") {}
};
}
extern Settings::ConfigHotKey configHotKey;
}

View File

@ -21,4 +21,6 @@ namespace Config
unsigned m_value;
};
}
extern Settings::CpuAffinity cpuAffinity;
}

View File

@ -15,4 +15,6 @@ namespace Config
}
};
}
extern Settings::CpuAffinityRotation cpuAffinityRotation;
}

View File

@ -17,4 +17,6 @@ namespace Config
}
};
}
extern Settings::DesktopColorDepth desktopColorDepth;
}

View File

@ -17,4 +17,6 @@ namespace Config
virtual ParamInfo getParamInfo() const override;
};
}
extern Settings::DisplayFilter displayFilter;
}

View File

@ -19,4 +19,6 @@ namespace Config
void setValue(const std::string& value) override;
};
}
extern Settings::DisplayRefreshRate displayRefreshRate;
}

View File

@ -22,4 +22,6 @@ namespace Config
void setValue(const std::string& value) override;
};
}
extern Settings::DisplayResolution displayResolution;
}

View File

@ -22,4 +22,6 @@ namespace Config
}
};
}
extern Settings::DpiAwareness dpiAwareness;
}

View File

@ -19,4 +19,6 @@ namespace Config
}
};
}
extern Settings::FontAntialiasing fontAntialiasing;
}

View File

@ -15,4 +15,6 @@ namespace Config
}
};
}
extern Settings::ForceD3D9On12 forceD3D9On12;
}

View File

@ -19,4 +19,6 @@ namespace Config
virtual ParamInfo getParamInfo() const override;
};
}
extern Settings::FpsLimiter fpsLimiter;
}

View File

@ -18,4 +18,6 @@ namespace Config
}
};
}
extern Settings::FullscreenMode fullscreenMode;
}

View File

@ -26,4 +26,6 @@ namespace Config
}
};
}
extern Settings::LogLevel logLevel;
}

View File

@ -15,4 +15,6 @@ namespace Config
}
};
}
extern Settings::PalettizedTextures palettizedTextures;
}

View File

@ -15,4 +15,6 @@ namespace Config
}
};
}
extern Settings::RemoveBorders removeBorders;
}

View File

@ -15,4 +15,6 @@ namespace Config
}
};
}
extern Settings::RenderColorDepth renderColorDepth;
}

View File

@ -24,4 +24,6 @@ namespace Config
void setValue(const std::string& value) override;
};
}
extern Settings::ResolutionScale resolutionScale;
}

View File

@ -18,4 +18,6 @@ namespace Config
}
};
}
extern Settings::ResolutionScaleFilter resolutionScaleFilter;
}

View File

@ -22,4 +22,6 @@ namespace Config
}
};
}
extern Settings::SoftwareDevice softwareDevice;
}

View File

@ -19,4 +19,6 @@ namespace Config
virtual ParamInfo getParamInfo() const override;
};
}
extern Settings::SpriteDetection spriteDetection;
}

View File

@ -12,4 +12,6 @@ namespace Config
SpriteFilter();
};
}
extern Settings::SpriteFilter spriteFilter;
}

View File

@ -19,4 +19,6 @@ namespace Config
virtual ParamInfo getParamInfo() const override;
};
}
extern Settings::SpriteTexCoord spriteTexCoord;
}

View File

@ -12,4 +12,6 @@ namespace Config
StatsHotKey() : HotKeySetting("StatsHotKey", "shift+f12") {}
};
}
extern Settings::StatsHotKey statsHotKey;
}

View File

@ -27,4 +27,6 @@ namespace Config
std::set<SIZE> m_resolutions;
};
}
extern Settings::SupportedResolutions supportedResolutions;
}

View File

@ -12,4 +12,6 @@ namespace Config
TerminateHotKey() : HotKeySetting("TerminateHotKey", "ctrl+alt+end") {}
};
}
extern Settings::TerminateHotKey terminateHotKey;
}

View File

@ -18,4 +18,6 @@ namespace Config
UINT getMaxAnisotropy() const { return std::get<2>(m_value); }
};
}
extern Settings::TextureFilter textureFilter;
}

View File

@ -17,4 +17,6 @@ namespace Config
}
};
}
extern Settings::ThreadPriorityBoost threadPriorityBoost;
}

View File

@ -18,4 +18,6 @@ namespace Config
virtual ParamInfo getParamInfo() const override;
};
}
extern Settings::VSync vSync;
}

View File

@ -23,4 +23,6 @@ namespace Config
virtual ParamInfo getParamInfo() const override;
};
}
extern Settings::WinVersionLie winVersionLie;
}

View File

@ -3,7 +3,9 @@
#include <Common/Comparison.h>
#include <Common/CompatVtable.h>
#include <Config/Config.h>
#include <Config/Settings/Antialiasing.h>
#include <Config/Settings/PalettizedTextures.h>
#include <Config/Settings/ResolutionScale.h>
#include <D3dDdi/Adapter.h>
#include <D3dDdi/AdapterFuncs.h>
#include <D3dDdi/Device.h>

View File

@ -1,6 +1,9 @@
#include <algorithm>
#include <Config/Config.h>
#include <Config/Settings/AlternatePixelCenter.h>
#include <Config/Settings/SpriteFilter.h>
#include <Config/Settings/SpriteTexCoord.h>
#include <Config/Settings/TextureFilter.h>
#include <Common/Log.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/DeviceState.h>

View File

@ -1,7 +1,8 @@
#include <algorithm>
#include <Common/Log.h>
#include <Config/Config.h>
#include <Config/Settings/SpriteDetection.h>
#include <Config/Settings/SpriteTexCoord.h>
#include <D3dDdi/DrawPrimitive.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/Resource.h>

View File

@ -7,7 +7,7 @@
#include <Common/Hook.h>
#include <Common/ScopedSrwLock.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Config/Settings/ForceD3D9On12.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/KernelModeThunks.h>
#include <D3dDdi/Log/KernelModeThunksLog.h>

View File

@ -5,7 +5,10 @@
#include <Common/Log.h>
#include <Common/Rect.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Config/Settings/BltFilter.h>
#include <Config/Settings/DisplayFilter.h>
#include <Config/Settings/RenderColorDepth.h>
#include <Config/Settings/ResolutionScaleFilter.h>
#include <D3dDdi/Adapter.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/KernelModeThunks.h>

View File

@ -5,7 +5,9 @@
#include <Common/Comparison.h>
#include <Common/CompatPtr.h>
#include <Common/CompatVtable.h>
#include <Config/Config.h>
#include <Config/Settings/AltTabFix.h>
#include <Config/Settings/PalettizedTextures.h>
#include <Config/Settings/SoftwareDevice.h>
#include <D3dDdi/Adapter.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/KernelModeThunks.h>

View File

@ -3,7 +3,6 @@
#include <Common/CompatVtable.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <DDraw/DirectDrawPalette.h>
#include <DDraw/ScopedThreadLock.h>
#include <DDraw/Surfaces/PrimarySurface.h>

View File

@ -7,7 +7,8 @@
#include <Common/ScopedCriticalSection.h>
#include <Common/ScopedThreadPriority.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Config/Settings/FpsLimiter.h>
#include <Config/Settings/VSync.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/KernelModeThunks.h>
#include <D3dDdi/Resource.h>

View File

@ -1,6 +1,5 @@
#include <Common/CompatPtr.h>
#include <Common/CompatRef.h>
#include <Config/Config.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/KernelModeThunks.h>
#include <D3dDdi/Resource.h>

View File

@ -1,5 +1,5 @@
#include <Common/CompatPtr.h>
#include <Config/Config.h>
#include <Config/Settings/FpsLimiter.h>
#include <D3dDdi/KernelModeThunks.h>
#include <D3dDdi/ScopedCriticalSection.h>
#include <DDraw/DirectDrawClipper.h>

View File

@ -3,7 +3,7 @@
#include <initguid.h>
#include <Common/CompatPtr.h>
#include <Config/Config.h>
#include <Config/Settings/AlignSysMemSurfaces.h>
#include <DDraw/DirectDrawClipper.h>
#include <DDraw/DirectDrawSurface.h>
#include <DDraw/Surfaces/Surface.h>

View File

@ -1,6 +1,6 @@
#include <map>
#include <Config/Config.h>
#include <Config/Settings/RemoveBorders.h>
#include <DDraw/DirectDraw.h>
#include <DDraw/Surfaces/TagSurface.h>

View File

@ -152,7 +152,6 @@
<ClInclude Include="Common\Hook.h" />
<ClInclude Include="Common\ScopedCriticalSection.h" />
<ClInclude Include="Common\Time.h" />
<ClInclude Include="Config\Config.h" />
<ClInclude Include="Config\EnumSetting.h" />
<ClInclude Include="Config\HotKeySetting.h" />
<ClInclude Include="Config\ListSetting.h" />

View File

@ -237,9 +237,6 @@
<ClInclude Include="Win32\Registry.h">
<Filter>Header Files\Win32</Filter>
</ClInclude>
<ClInclude Include="Config\Config.h">
<Filter>Header Files\Config</Filter>
</ClInclude>
<ClInclude Include="DDraw\Surfaces\Surface.h">
<Filter>Header Files\DDraw\Surfaces</Filter>
</ClInclude>

View File

@ -1,8 +1,9 @@
#include <set>
#include <Common/Comparison.h>
#include <Common/CompatPtr.h>
#include <Common/CompatVtable.h>
#include <Config/Config.h>
#include <Config/Settings/SoftwareDevice.h>
#include <D3dDdi/Device.h>
#include <DDraw/DirectDrawSurface.h>
#include <DDraw/ScopedThreadLock.h>

View File

@ -9,8 +9,9 @@
#include <Common/Log.h>
#include <Common/Path.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Config/Parser.h>
#include <Config/Settings/DpiAwareness.h>
#include <Config/Settings/FullscreenMode.h>
#include <D3dDdi/Hooks.h>
#include <DDraw/DirectDraw.h>
#include <DDraw/Hooks.h>

View File

@ -1,6 +1,6 @@
#include <Common/Hook.h>
#include <Common/Log.h>
#include <Config/Config.h>
#include <Config/Settings/FontAntialiasing.h>
#include <Gdi/Font.h>
namespace

View File

@ -1,6 +1,6 @@
#include <map>
#include <Config/Config.h>
#include <Config/Settings/AlignSysMemSurfaces.h>
#include <Common/ScopedCriticalSection.h>
#include <D3dDdi/Device.h>
#include <D3dDdi/Resource.h>

View File

@ -8,7 +8,8 @@
#include <Common/ScopedSrwLock.h>
#include <Common/ScopedThreadPriority.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Config/Settings/FpsLimiter.h>
#include <Config/Settings/RemoveBorders.h>
#include <Dll/Dll.h>
#include <DDraw/DirectDraw.h>
#include <DDraw/RealPrimarySurface.h>

View File

@ -7,7 +7,7 @@
#include <Common/Hook.h>
#include <Common/Log.h>
#include <Config/Config.h>
#include <Config/Settings/TerminateHotKey.h>
#include <Dll/Dll.h>
#include <DDraw/RealPrimarySurface.h>
#include <Gdi/GuiThread.h>

View File

@ -2,7 +2,21 @@
#include <sstream>
#include <Common/Log.h>
#include <Config/Config.h>
#include <Config/Settings/AlternatePixelCenter.h>
#include <Config/Settings/Antialiasing.h>
#include <Config/Settings/BltFilter.h>
#include <Config/Settings/ConfigHotKey.h>
#include <Config/Settings/DisplayFilter.h>
#include <Config/Settings/FontAntialiasing.h>
#include <Config/Settings/FpsLimiter.h>
#include <Config/Settings/RenderColorDepth.h>
#include <Config/Settings/ResolutionScale.h>
#include <Config/Settings/ResolutionScaleFilter.h>
#include <Config/Settings/SpriteDetection.h>
#include <Config/Settings/SpriteFilter.h>
#include <Config/Settings/SpriteTexCoord.h>
#include <Config/Settings/TextureFilter.h>
#include <Config/Settings/VSync.h>
#include <Gdi/GuiThread.h>
#include <Input/Input.h>
#include <Overlay/ConfigWindow.h>
@ -27,8 +41,8 @@ namespace Overlay
m_captionCloseButton.reset(new ButtonControl(*this, r, "X", onClose));
addControl(Config::alternatePixelCenter);
addControl(Config::bltFilter);
addControl(Config::antialiasing);
addControl(Config::bltFilter);
addControl(Config::displayFilter);
addControl(Config::fontAntialiasing);
addControl(Config::fpsLimiter);

View File

@ -1,4 +1,9 @@
#include <Config/Config.h>
#include <Config/Settings/Antialiasing.h>
#include <Config/Settings/RenderColorDepth.h>
#include <Config/Settings/ResolutionScale.h>
#include <Config/Settings/SpriteFilter.h>
#include <Config/Settings/SpriteTexCoord.h>
#include <Config/Settings/TextureFilter.h>
#include <Config/Setting.h>
#include <D3dDdi/Device.h>
#include <Overlay/ComboBoxControl.h>

View File

@ -2,7 +2,7 @@
#include <functional>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Config/Settings/StatsHotKey.h>
#include <Gdi/GuiThread.h>
#include <Input/Input.h>
#include <Overlay/ConfigWindow.h>

View File

@ -5,7 +5,6 @@
#include <Common/Hook.h>
#include <Common/Log.h>
#include <Config/Config.h>
#include <Dll/Dll.h>
#include <DDraw/RealPrimarySurface.h>
#include <DDraw/Surfaces/PrimarySurface.h>

View File

@ -10,7 +10,10 @@
#include <Common/CompatPtr.h>
#include <Common/Hook.h>
#include <Common/ScopedSrwLock.h>
#include <Config/Config.h>
#include <Config/Settings/DesktopColorDepth.h>
#include <Config/Settings/DisplayRefreshRate.h>
#include <Config/Settings/DisplayResolution.h>
#include <Config/Settings/SupportedResolutions.h>
#include <DDraw/DirectDraw.h>
#include <DDraw/ScopedThreadLock.h>
#include <Gdi/Gdi.h>

View File

@ -8,7 +8,9 @@
#include <Common/Hook.h>
#include <Common/Log.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Config/Settings/CpuAffinity.h>
#include <Config/Settings/CpuAffinityRotation.h>
#include <Config/Settings/ThreadPriorityBoost.h>
#include <Dll/Dll.h>
#include <Win32/Thread.h>

View File

@ -2,7 +2,7 @@
#include <Common/Hook.h>
#include <Common/Log.h>
#include <Config/Config.h>
#include <Config/Settings/WinVersionLie.h>
#include <Win32/Version.h>