HBAO+ 3.1.0.21602716

11 files changed, 42 insertions, 10 deletions

diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj b/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj
index 5a15919..a9ba3e2 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj
@@ -45,6 +45,9 @@
     <ClCompile Include="..\..\..\src\Shaders_DX11.cpp" />
     <ClCompile Include="..\..\..\src\States_DX11.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>GFSDK_SSAO_D3D11</ProjectName>
     <ProjectGuid>{94E21C5D-95F5-4096-AEE0-C7C51F7FE02A}</ProjectGuid>
@@ -83,8 +86,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_MT|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include;$(ProjectDir)\..\..\..\src\NVAPI</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SUPPORT_D3D11=1;USE_NVAPI=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
@@ -95,14 +98,15 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;nvapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\..\src\NVAPI\x86</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_MT|x64'">
     <ClCompile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include;$(ProjectDir)\..\..\..\src\NVAPI</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SUPPORT_D3D11=1;USE_NVAPI=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
@@ -112,7 +116,8 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;nvapi64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\..\src\NVAPI\amd64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj.filters b/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj.filters
index a2aff9d..12cbd36 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj.filters
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj.filters
@@ -105,4 +105,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj b/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj
index c8e1180..27589d1 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj
@@ -45,6 +45,9 @@
     <ClCompile Include="..\..\..\src\Shaders_DX11.cpp" />
     <ClCompile Include="..\..\..\src\States_DX11.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>GFSDK_SSAO_D3D11_UWP</ProjectName>
     <ProjectGuid>{D213334C-5B95-414B-AED9-F203FFD1D00D}</ProjectGuid>
@@ -81,7 +84,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SUPPORT_D3D11=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
@@ -101,7 +104,7 @@
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SUPPORT_D3D11=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <CompileAsWinRT>true</CompileAsWinRT>
diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj.filters b/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj.filters
index 1d64b32..75e3302 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj.filters
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj.filters
@@ -105,4 +105,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj b/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj
index 0bb4cd4..ff0e76f 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj
@@ -47,6 +47,9 @@
     <ClCompile Include="..\..\..\src\Shaders_DX12.cpp" />
     <ClCompile Include="..\..\..\src\States_DX12.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>GFSDK_SSAO_D3D12</ProjectName>
     <ProjectGuid>{9E9A59CE-F50F-454A-A922-17324373A3A5}</ProjectGuid>
diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj.filters b/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj.filters
index 4712b9d..a96767b 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj.filters
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj.filters
@@ -111,4 +111,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj b/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj
index 2dcfb44..4d7997e 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj
@@ -46,6 +46,9 @@
     <ClCompile Include="..\..\..\src\Shaders_DX12.cpp" />
     <ClCompile Include="..\..\..\src\States_DX12.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>GFSDK_SSAO_D3D12_UWP</ProjectName>
     <ProjectGuid>{EBAE8F1C-7EBC-44AA-BF1A-B34F057A187F}</ProjectGuid>
@@ -82,7 +85,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SUPPORT_D3D12=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SUPPORT_D3D12=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
@@ -102,7 +105,7 @@
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SUPPORT_D3D12=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SUPPORT_D3D12=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <CompileAsWinRT>true</CompileAsWinRT>
diff --git a/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj.filters b/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj.filters
index a73f098..715a4b4 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj.filters
+++ b/build/platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj.filters
@@ -108,4 +108,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj b/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj
index 8cb852d..191e8ad 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj
+++ b/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj
@@ -48,6 +48,9 @@
     <ClCompile Include="..\..\..\src\Shaders_GL.cpp" />
     <ClCompile Include="..\..\..\src\States_GL.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>GFSDK_SSAO_GL</ProjectName>
     <ProjectGuid>{5C00BDFE-5300-4BF1-BFC2-DAB7998C6DED}</ProjectGuid>
diff --git a/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj.filters b/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj.filters
index 037c6f6..27cbdf4 100644
--- a/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj.filters
+++ b/build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj.filters
@@ -114,4 +114,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/platforms/vs2015/Resource.rc b/build/platforms/vs2015/Resource.rc
new file mode 100644
index 0000000..aa50cf0
--- /dev/null
+++ b/build/platforms/vs2015/Resource.rc