dx11 almost done

gow & strangers paradige black screens :/
cdozdil · Mar 1, 2024 · f48c51c · f48c51c
1 parent 8b92224
commit f48c51c
Show file tree

Hide file tree

Showing 9 changed files with 1,094 additions and 280 deletions.
diff --git a/CyberXeSS/CyberXeSS.vcxproj b/CyberXeSS/CyberXeSS.vcxproj
@@ -82,7 +82,7 @@
     <IncludePath>$(SolutionDir)external\simpleini;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\vulkan\include;$(SolutionDir)external\ffx-sdk\sdk\include;$(SolutionDir)external\fmt\include;$(SolutionDir)external\spdlog\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)external\xess\lib;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;$(LibraryPath)</LibraryPath>
     <TargetName>nvngx</TargetName>
-    <OutDir>E:\Games\Deep Rock Galactic\FSD\Binaries\Win64</OutDir>
+    <OutDir>E:\Games\God of War</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>$(SolutionDir)external\simpleini;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\vulkan\include;$(SolutionDir)external\ffx-sdk\sdk\include;$(SolutionDir)external\fmt\include;$(SolutionDir)external\spdlog\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>
@@ -178,6 +178,7 @@
     <ClInclude Include="NVNGX_Parameter.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="Util.h" />
+    <ClInclude Include="XeSSFeature_Dx11.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Config.cpp" />
@@ -190,6 +191,7 @@
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="XeSSFeature.cpp" />
     <ClCompile Include="XeSSFeature.h" />
+    <ClCompile Include="XeSSFeature_Dx11.cpp" />
     <ClCompile Include="XeSSFeature_Dx12.cpp" />
     <ClCompile Include="XeSSFeature_Dx12.h" />
     <ClCompile Include="Util.cpp" />

diff --git a/CyberXeSS/CyberXeSS.vcxproj.filters b/CyberXeSS/CyberXeSS.vcxproj.filters
@@ -59,6 +59,9 @@
     <ClInclude Include="pch.h">
       <Filter>Other</Filter>
     </ClInclude>
+    <ClInclude Include="XeSSFeature_Dx11.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Config.cpp">
@@ -98,5 +101,8 @@
     <ClCompile Include="IFeature_Dx12.cpp">
       <Filter>IFeature</Filter>
     </ClCompile>
+    <ClCompile Include="XeSSFeature_Dx11.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/CyberXeSS/IFeature.h b/CyberXeSS/IFeature.h
@@ -34,7 +34,6 @@ class IFeature
 	bool IsInitParameters() const { return _initParameters; };
 	static unsigned int GetNextHandleId() { return handleCounter++; }
 
-	virtual void ReInit(const NVSDK_NGX_Parameter* InParameters) = 0;
 	virtual bool IsInited() = 0;
 
 	IFeature(unsigned int handleId, const NVSDK_NGX_Parameter* InParameters)

diff --git a/CyberXeSS/IFeature_Dx11.h b/CyberXeSS/IFeature_Dx11.h
@@ -4,13 +4,14 @@
 class IFeature_Dx11 : public IFeature
 {
 protected:
-	ID3D11Device* Dx11Device = nullptr;
-	ID3D11DeviceContext* Dx11DeviceContext = nullptr;
+	ID3D11Device* Device = nullptr;
+	ID3D11DeviceContext* DeviceContext = nullptr;
 
 public:
 	virtual bool Init(ID3D11Device* device, ID3D11DeviceContext* context, const NVSDK_NGX_Parameter* initParams) = 0;
-	virtual bool Evaluate(ID3D11DeviceContext* deviceContext, const NVSDK_NGX_Parameter* initParams) = 0;
+	virtual bool Evaluate(ID3D11DeviceContext* DeviceContext, const NVSDK_NGX_Parameter* InParameters) = 0;
 	virtual void ReInit(const NVSDK_NGX_Parameter* InParameters) = 0;
+	static void Shutdown();
 
 	IFeature_Dx11(unsigned int handleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(handleId, InParameters)
 	{