rearrange headers and libraries

OptiScaler/FSR3_Dx12.cpp

@@ -7,8 +7,8 @@
 #include "NVNGX_Parameter.h"
 
 #include "detours/detours.h"
-#include "fsr3/include/ffx_fsr3upscaler.h"
-#include "fsr3/include/dx12/ffx_dx12.h"
+#include "fsr3/ffx_fsr3upscaler.h"
+#include "fsr3/dx12/ffx_dx12.h"
 
 // FSR3
 typedef Fsr3::FfxErrorCode(*PFN_ffxFsr3UpscalerContextCreate)(Fsr3::FfxFsr3UpscalerContext* pContext, const Fsr3::FfxFsr3UpscalerContextDescription* pContextDescription);

OptiScaler/OptiScaler.vcxproj

@@ -79,17 +79,17 @@
     <LibraryPath>$(XESS_SDK)\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(ProjectDir);$(SolutionDir)external\vulkan\include;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\FidelityFX-SDK\ffx-api\include\ffx_api;$(SolutionDir)external\simpleini;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\spdlog\include;$(SolutionDir)external\freetype;$(SolutionDir)external\streamline;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)fsr2\lib;$(ProjectDir)fsr2_212\lib;$(ProjectDir)fsr31\lib;$(ProjectDir)vulkan;$(ProjectDir)d3dx;$(ProjectDir)detours;$(SolutionDir)external\xess\lib;$(SolutionDir)external\freetype;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir);$(ProjectDir)include\;$(SolutionDir)external\vulkan\include;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\FidelityFX-SDK\ffx-api\include\ffx_api;$(SolutionDir)external\simpleini;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\spdlog\include;$(SolutionDir)external\freetype;$(SolutionDir)external\streamline;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)library\fsr2;$(ProjectDir)library\fsr2_212;$(ProjectDir)library\fsr31;$(ProjectDir)library\vulkan;$(ProjectDir)library\d3dx;$(ProjectDir)library\detours;$(SolutionDir)external\xess\lib;$(SolutionDir)external\freetype;$(LibraryPath)</LibraryPath>
     <TargetName>dxgi</TargetName>
     <OutDir>D:\Folders\Games\Epic\DeliverUsMars\DeliverUsMars\Binaries\Win64\</OutDir>
     <IntDir>.\x64\Debug</IntDir>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(ProjectDir);$(SolutionDir)external\vulkan\include;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\FidelityFX-SDK\ffx-api\include\ffx_api;$(SolutionDir)external\simpleini;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\spdlog\include;$(SolutionDir)external\freetype;$(SolutionDir)external\streamline;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);$(ProjectDir)include\;$(SolutionDir)external\vulkan\include;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\FidelityFX-SDK\ffx-api\include\ffx_api;$(SolutionDir)external\simpleini;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\spdlog\include;$(SolutionDir)external\freetype;$(SolutionDir)external\streamline;$(IncludePath)</IncludePath>
     <TargetName>nvngx</TargetName>
-    <LibraryPath>$(ProjectDir)fsr2\lib;$(ProjectDir)fsr2_212\lib;$(ProjectDir)fsr31\lib;$(ProjectDir)vulkan;$(ProjectDir)d3dx;$(ProjectDir)detours;$(SolutionDir)external\xess\lib;$(SolutionDir)external\freetype;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(ProjectDir)library\fsr2;$(ProjectDir)library\fsr2_212;$(ProjectDir)library\fsr31;$(ProjectDir)library\vulkan;$(ProjectDir)library\d3dx;$(ProjectDir)library\detours;$(SolutionDir)external\xess\lib;$(SolutionDir)external\freetype;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -380,9 +380,6 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClCompile Include="XeSS_Debug.cpp" />
     <ClCompile Include="XeSS_Dx12.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="vulkan\vulkan-1.lib" />
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="OptiScaler.rc" />
   </ItemGroup>

OptiScaler/backends/fsr2/FSR2Feature.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <fsr2/include/ffx_fsr2.h>
+#include <fsr2/ffx_fsr2.h>
 
 #include <backends/IFeature.h>
 

OptiScaler/backends/fsr2/FSR2Feature_Dx11.h

@@ -4,8 +4,8 @@
 
 #include <dxgi1_4.h>
 
-#include <fsr2/include/ffx_fsr2.h>
-#include <fsr2/include/dx11/ffx_fsr2_dx11.h>
+#include <fsr2/ffx_fsr2.h>
+#include <fsr2/dx11/ffx_fsr2_dx11.h>
 
 class FSR2FeatureDx11 : public FSR2Feature, public IFeature_Dx11
 {

OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.h

@@ -2,8 +2,8 @@
 #include "FSR2Feature.h"
 #include <backends/IFeature_Dx11wDx12.h>
 
-#include <fsr2/include/ffx_fsr2.h>
-#include <fsr2/include/dx12/ffx_fsr2_dx12.h>
+#include <fsr2/ffx_fsr2.h>
+#include <fsr2/dx12/ffx_fsr2_dx12.h>
 
 class FSR2FeatureDx11on12 : public FSR2Feature, public IFeature_Dx11wDx12
 {

OptiScaler/backends/fsr2/FSR2Feature_Dx12.h

@@ -2,8 +2,8 @@
 #include "FSR2Feature.h"
 #include <backends/IFeature_Dx12.h>
 
-#include <fsr2/include/ffx_fsr2.h>
-#include <fsr2/include/dx12/ffx_fsr2_dx12.h>
+#include <fsr2/ffx_fsr2.h>
+#include <fsr2/dx12/ffx_fsr2_dx12.h>
 
 class FSR2FeatureDx12 : public FSR2Feature, public IFeature_Dx12
 {

OptiScaler/backends/fsr2/FSR2Feature_Vk.h

@@ -1,8 +1,8 @@
 #pragma once
 
 
-#include <fsr2/include/ffx_fsr2.h>
-#include <fsr2/include/vk/ffx_fsr2_vk.h>
+#include <fsr2/ffx_fsr2.h>
+#include <fsr2/vk/ffx_fsr2_vk.h>
 
 #include "FSR2Feature.h"
 #include <backends/IFeature_Vk.h>

OptiScaler/backends/fsr2_212/FSR2Feature_212.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <fsr2_212/include/ffx_fsr2.h>
+#include <fsr2_212/ffx_fsr2.h>
 
 #include <backends/IFeature.h>
 

OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.h

@@ -2,8 +2,8 @@
 #include "FSR2Feature_212.h"
 #include <backends/IFeature_Dx11wDx12.h>
 
-#include <fsr2_212/include/ffx_fsr2.h>
-#include <fsr2_212/include/dx12/ffx_fsr2_dx12.h>
+#include <fsr2_212/ffx_fsr2.h>
+#include <fsr2_212/dx12/ffx_fsr2_dx12.h>
 
 class FSR2FeatureDx11on12_212 : public FSR2Feature212, public IFeature_Dx11wDx12
 {

OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.h

@@ -2,8 +2,8 @@
 #include "FSR2Feature_212.h"
 #include <backends/IFeature_Dx12.h>
 
-#include <fsr2_212/include/ffx_fsr2.h>
-#include <fsr2_212/include/dx12/ffx_fsr2_dx12.h>
+#include <fsr2_212/ffx_fsr2.h>
+#include <fsr2_212/dx12/ffx_fsr2_dx12.h>
 
 class FSR2FeatureDx12_212 : public FSR2Feature212, public IFeature_Dx12
 {

OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h

@@ -1,8 +1,8 @@
 #pragma once
 
 
-#include <fsr2_212/include/ffx_fsr2.h>
-#include <fsr2_212/include/vk/ffx_fsr2_vk.h>
+#include <fsr2_212/ffx_fsr2.h>
+#include <fsr2_212/vk/ffx_fsr2_vk.h>
 
 #include "FSR2Feature_212.h"
 #include <backends/IFeature_Vk.h>

OptiScaler/backends/fsr31/FSR31Feature_Dx11.h

@@ -2,10 +2,10 @@
 #include "FSR31Feature.h"
 #include <backends/IFeature_Dx11.h>
 
-#include <fsr31/include/dx11/ffx_dx11.h>
-#include <fsr31/include/ffx_fsr3.h>
-#include <fsr31/include/ffx_types.h>
-#include <fsr31/include/ffx_error.h>
+#include <fsr31/dx11/ffx_dx11.h>
+#include <fsr31/ffx_fsr3.h>
+#include <fsr31/ffx_types.h>
+#include <fsr31/ffx_error.h>
 
 class FSR31FeatureDx11 : public FSR31Feature, public IFeature_Dx11
 {