Skip to content

Commit

Permalink
refactoring continues
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdozdil
cdozdil committed Mar 1, 2024
1 parent 8517901 commit 8b92224
Show file tree
Hide file tree
Showing 20 changed files with 155 additions and 374 deletions.
4 changes: 4 additions & 0 deletions CyberXeSS/Config.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#include "pch.h"
#include "Config.h"
#include <SimpleIni.h>
#include "Util.h"

static CSimpleIniA ini;

Config::Config(std::wstring fileName)
{
absoluteFileName = Util::DllPath().parent_path() / fileName;
Expand Down
7 changes: 0 additions & 7 deletions CyberXeSS/Config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
#include <optional>
#include <filesystem>

#include <SimpleIni.h>

#define SPDLOG_USE_STD_FORMAT
#include "spdlog/spdlog.h"

class Config
{
public:
Expand Down Expand Up @@ -69,8 +64,6 @@ class Config
static Config* Instance();

private:
CSimpleIniA ini;

inline static Config* _config;

std::filesystem::path absoluteFileName;
Expand Down
56 changes: 2 additions & 54 deletions CyberXeSS/CyberXeSS.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,54 +168,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="cas\ffx_cas_private.h" />
<ClInclude Include="cas\ffx_object_management.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_shaderblobs.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_14b6b45c19f8bef7f1c9c210a0b759b0.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_370e66e23c2617f1d0d1a41ce92020d1.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_6356b189c5394e8ad58e0feed21340e9.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_75e453678ddf59ccd581676c1ae1a2bd.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_9f81ecd320aa8aff19e833b4ddea7d0e.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_b899ff1caf94993c974933c02dab0fb8.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_c65a1a3b559e19386ef3025d545a3c75.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_dea07810b46ba36566bd4aa1ff78a82a.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_f5892826f4370686e7fda97005b035f1.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_f9509b7419ac3ee6c695698856e59a0b.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_permutations.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_614a6e8563a7739e2e1d1da9a912cfde.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_713b2dd57ee05ace40553c55be3046cb.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_88708abc518c21de032439084a94984f.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_88eec194ce38246cc0c6cef61356d750.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_8af9cc39542bf35bb40b4bb8ae4d55b6.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_d8fdba1e88140f2ffede2256569e6847.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_dd67b43cea4b5b5de2be677e3d8fbed2.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_ee2bdf5ae8a17c2f999bce0f168d7d77.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_fa3d883becd2c65411840779acf5d69a.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_fe571d470c8b4b84ac904f8b27772e65.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_permutations.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_071c6ce55ce3193bad742e5c24b3c4ca.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_391091f5c9521b4b9ae7b81e048857a6.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_477af1119a602c2fe95b47dbb192cc15.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_63d861ab10fb45dd4581b0b9f04a68cd.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_6826c6e0ba2ab6d8280fc00af0964aaa.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_6a2787277532a9c0bbd0b938a8a52f93.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_a812826a8db423e775d5777a998f593d.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_b9ee87e9cec8de305f5b2603065fcc21.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_bf2fa42b327534c6759981f2cd5f9fbc.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_dcf57d714c2c7dbf7a034b385635f3f5.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_permutations.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_3121abbb07703be0f238c81f019132be.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_4805066f235102778d56cc2ee4cb57d7.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_49b4d708efd7f819fd04bbaaffb26384.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_5eac039bab8b5c1c000063672134a3c9.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_83902f06daf0596069bc80aebf06dcb2.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_939376e5371bfeaa5c316c9b8f966af7.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_adaa0bf14c3e27aa53c21008b01bc19d.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_c9aaf6985030cbcf4344514366e3156c.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_e7c573b4d3534237e56145ee2076445f.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_ec8c698e41b4daa7d74a1e6bd13b0240.h" />
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_permutations.h" />
<ClInclude Include="cas\shared\ffx_shader_blobs.h" />
<ClInclude Include="Config.h" />
<ClInclude Include="CyberXess.h" />
<ClInclude Include="framework.h" />
Expand All @@ -228,14 +180,10 @@
<ClInclude Include="Util.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="cas\ffx_assert.cpp" />
<ClCompile Include="cas\ffx_cas.cpp" />
<ClCompile Include="cas\ffx_dx12.cpp" />
<ClCompile Include="cas\ffx_object_management.cpp" />
<ClCompile Include="cas\shared\blob_accessors\ffx_cas_shaderblobs.cpp" />
<ClCompile Include="cas\shared\ffx_shader_blobs.cpp" />
<ClCompile Include="Config.cpp" />
<ClCompile Include="CyberXess.cpp" />
<ClCompile Include="IFeature.cpp" />
<ClCompile Include="IFeature_Dx12.cpp" />
<ClCompile Include="NVNGX_DLSS_Dx11.cpp" />
<ClCompile Include="NVNGX_DLSS_Dx12.cpp" />
<ClCompile Include="NVNGX_DLSS_Vk.cpp" />
Expand Down
171 changes: 6 additions & 165 deletions CyberXeSS/CyberXeSS.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<Filter Include="XeSS">
<UniqueIdentifier>{5b727ebe-fcfc-4b50-b956-8b7ba3456954}</UniqueIdentifier>
</Filter>
<Filter Include="FFX_CAS">
<UniqueIdentifier>{1dafe9f8-c3ee-4b0c-99af-f0244d07b063}</UniqueIdentifier>
</Filter>
<Filter Include="Util">
<UniqueIdentifier>{8cf642d0-7481-41f8-b96f-f3ecfdd50752}</UniqueIdentifier>
</Filter>
Expand All @@ -50,150 +47,6 @@
<ClInclude Include="NVNGX_Parameter.h">
<Filter>NVNGX</Filter>
</ClInclude>
<ClInclude Include="cas\ffx_cas_private.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_shaderblobs.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_8af9cc39542bf35bb40b4bb8ae4d55b6.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_9f81ecd320aa8aff19e833b4ddea7d0e.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_14b6b45c19f8bef7f1c9c210a0b759b0.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_75e453678ddf59ccd581676c1ae1a2bd.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_370e66e23c2617f1d0d1a41ce92020d1.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_6356b189c5394e8ad58e0feed21340e9.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_b899ff1caf94993c974933c02dab0fb8.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_c65a1a3b559e19386ef3025d545a3c75.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_dea07810b46ba36566bd4aa1ff78a82a.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_f9509b7419ac3ee6c695698856e59a0b.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_f5892826f4370686e7fda97005b035f1.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_16bit_permutations.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_88eec194ce38246cc0c6cef61356d750.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_614a6e8563a7739e2e1d1da9a912cfde.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_713b2dd57ee05ace40553c55be3046cb.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_88708abc518c21de032439084a94984f.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_d8fdba1e88140f2ffede2256569e6847.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_dd67b43cea4b5b5de2be677e3d8fbed2.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_ee2bdf5ae8a17c2f999bce0f168d7d77.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_fa3d883becd2c65411840779acf5d69a.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_fe571d470c8b4b84ac904f8b27772e65.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_permutations.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_5eac039bab8b5c1c000063672134a3c9.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_6a2787277532a9c0bbd0b938a8a52f93.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_63d861ab10fb45dd4581b0b9f04a68cd.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_071c6ce55ce3193bad742e5c24b3c4ca.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_477af1119a602c2fe95b47dbb192cc15.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_6826c6e0ba2ab6d8280fc00af0964aaa.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_391091f5c9521b4b9ae7b81e048857a6.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_a812826a8db423e775d5777a998f593d.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_b9ee87e9cec8de305f5b2603065fcc21.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_bf2fa42b327534c6759981f2cd5f9fbc.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_dcf57d714c2c7dbf7a034b385635f3f5.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_16bit_permutations.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_49b4d708efd7f819fd04bbaaffb26384.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_3121abbb07703be0f238c81f019132be.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_83902f06daf0596069bc80aebf06dcb2.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_939376e5371bfeaa5c316c9b8f966af7.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_4805066f235102778d56cc2ee4cb57d7.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_adaa0bf14c3e27aa53c21008b01bc19d.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_c9aaf6985030cbcf4344514366e3156c.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_e7c573b4d3534237e56145ee2076445f.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_ec8c698e41b4daa7d74a1e6bd13b0240.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\blob_accessors\ffx_cas_sharpen_pass_wave64_permutations.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\ffx_object_management.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="cas\shared\ffx_shader_blobs.h">
<Filter>FFX_CAS</Filter>
</ClInclude>
<ClInclude Include="Util.h">
<Filter>Util</Filter>
</ClInclude>
Expand Down Expand Up @@ -232,30 +85,18 @@
<ClCompile Include="XeSSFeature_Dx12.h">
<Filter>XeSS</Filter>
</ClCompile>
<ClCompile Include="cas\ffx_assert.cpp">
<Filter>FFX_CAS</Filter>
</ClCompile>
<ClCompile Include="cas\ffx_cas.cpp">
<Filter>FFX_CAS</Filter>
</ClCompile>
<ClCompile Include="cas\shared\blob_accessors\ffx_cas_shaderblobs.cpp">
<Filter>FFX_CAS</Filter>
</ClCompile>
<ClCompile Include="cas\ffx_dx12.cpp">
<Filter>FFX_CAS</Filter>
</ClCompile>
<ClCompile Include="cas\ffx_object_management.cpp">
<Filter>FFX_CAS</Filter>
</ClCompile>
<ClCompile Include="cas\shared\ffx_shader_blobs.cpp">
<Filter>FFX_CAS</Filter>
</ClCompile>
<ClCompile Include="dllmain.cpp" />
<ClCompile Include="Util.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="CyberXess.cpp">
<Filter>Other</Filter>
</ClCompile>
<ClCompile Include="IFeature.cpp">
<Filter>IFeature</Filter>
</ClCompile>
<ClCompile Include="IFeature_Dx12.cpp">
<Filter>IFeature</Filter>
</ClCompile>
</ItemGroup>
</Project>
35 changes: 35 additions & 0 deletions CyberXeSS/IFeature.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#include "pch.h"
#include "IFeature.h"

void IFeature::SetHandle(unsigned int handleId)
{
_handle = new NVSDK_NGX_Handle{ handleId };
spdlog::info("IFeatureContext::SetHandle Handle: {0}", _handle->Id);
}

bool IFeature::SetInitParameters(const NVSDK_NGX_Parameter* InParameters)
{
unsigned int width, outWidth, height, outHeight;
int pqValue;

if (InParameters->Get(NVSDK_NGX_Parameter_Width, &width) == NVSDK_NGX_Result_Success &&
InParameters->Get(NVSDK_NGX_Parameter_Height, &height) == NVSDK_NGX_Result_Success &&
InParameters->Get(NVSDK_NGX_Parameter_OutWidth, &outWidth) == NVSDK_NGX_Result_Success &&
InParameters->Get(NVSDK_NGX_Parameter_OutHeight, &outHeight) == NVSDK_NGX_Result_Success &&
InParameters->Get(NVSDK_NGX_Parameter_PerfQualityValue, &pqValue) == NVSDK_NGX_Result_Success)
{
_displayWidth = width > outWidth ? width : outWidth;
_displayHeight = height > outHeight ? height : outHeight;
_renderWidth = width < outWidth ? width : outWidth;
_renderHeight = height < outHeight ? height : outHeight;
_perfQualityValue = (NVSDK_NGX_PerfQuality_Value)pqValue;

spdlog::info("IFeatureContext::SetInitParameters Render Resolution: {0}x{1}, Display Resolution {2}x{3}, Quality: {4}",
_renderWidth, _renderHeight, _displayWidth, _displayHeight, pqValue);

return true;
}

spdlog::error("IFeatureContext::SetInitParameters Can't set parameters!");
return false;
}
Loading

0 comments on commit 8b92224

Please sign in to comment.