From 0e07a80f8c1443e047e283f30693cf708a3204ea Mon Sep 17 00:00:00 2001 From: lbavoil Date: Mon, 23 Jan 2017 09:55:05 +0100 Subject: HBAO+ 3.1.0.21602716 --- build/platforms/vs2015/GFSDK_SSAO_D3D11.vcxproj | 17 +++++++---- .../vs2015/GFSDK_SSAO_D3D11.vcxproj.filters | 3 ++ .../platforms/vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj | 7 +++-- .../vs2015/GFSDK_SSAO_D3D11_UWP.vcxproj.filters | 3 ++ build/platforms/vs2015/GFSDK_SSAO_D3D12.vcxproj | 3 ++ .../vs2015/GFSDK_SSAO_D3D12.vcxproj.filters | 3 ++ .../platforms/vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj | 7 +++-- .../vs2015/GFSDK_SSAO_D3D12_UWP.vcxproj.filters | 3 ++ build/platforms/vs2015/GFSDK_SSAO_GL.vcxproj | 3 ++ .../platforms/vs2015/GFSDK_SSAO_GL.vcxproj.filters | 3 ++ build/platforms/vs2015/Resource.rc | Bin 0 -> 3358 bytes doc/.buildinfo | 2 +- doc/_sources/changelog.txt | 6 ++++ doc/changelog.html | 26 +++++++++------- doc/genindex.html | 14 ++++----- doc/index.html | 20 ++++++------- doc/objects.inv | 2 +- doc/product.html | 16 +++++----- doc/releasenotes.html | 18 +++++------ doc/search.html | 14 ++++----- doc/searchindex.js | 2 +- .../Sphinx-1.2.dist-info/DESCRIPTION.html | 14 ++++----- .../setuptools-2.1.dist-info/DESCRIPTION.html | 14 ++++----- .../autosummary/templates/autosummary/base.html | 14 ++++----- .../autosummary/templates/autosummary/class.html | 14 ++++----- .../autosummary/templates/autosummary/module.html | 14 ++++----- .../tests/roots/test-only-directive/contents.html | 14 ++++----- .../tests/roots/test-only-directive/only.html | 14 ++++----- include/GFSDK_SSAO.h | 14 ++++----- lib/GFSDK_SSAO_D3D11.win32.dll | Bin 966656 -> 1053184 bytes lib/GFSDK_SSAO_D3D11.win32.lib | Bin 2328 -> 2328 bytes lib/GFSDK_SSAO_D3D11.win64.dll | Bin 1078272 -> 1196032 bytes lib/GFSDK_SSAO_D3D11.win64.lib | Bin 2326 -> 2326 bytes lib/GFSDK_SSAO_D3D11_UWP.win32.dll | Bin 467456 -> 469504 bytes lib/GFSDK_SSAO_D3D11_UWP.win32.lib | Bin 2384 -> 2384 bytes lib/GFSDK_SSAO_D3D11_UWP.win64.dll | Bin 477696 -> 479744 bytes lib/GFSDK_SSAO_D3D11_UWP.win64.lib | Bin 2382 -> 2382 bytes lib/GFSDK_SSAO_D3D12.win32.dll | Bin 980480 -> 972288 bytes lib/GFSDK_SSAO_D3D12.win32.lib | Bin 2328 -> 2328 bytes lib/GFSDK_SSAO_D3D12.win64.dll | Bin 1090048 -> 1079808 bytes lib/GFSDK_SSAO_D3D12.win64.lib | Bin 2326 -> 2326 bytes lib/GFSDK_SSAO_D3D12_UWP.win32.dll | Bin 477184 -> 479744 bytes lib/GFSDK_SSAO_D3D12_UWP.win32.lib | Bin 2384 -> 2384 bytes lib/GFSDK_SSAO_D3D12_UWP.win64.dll | Bin 485888 -> 487424 bytes lib/GFSDK_SSAO_D3D12_UWP.win64.lib | Bin 2382 -> 2382 bytes lib/GFSDK_SSAO_GL.osx.dylib | Bin 2069252 -> 0 bytes lib/GFSDK_SSAO_GL.win32.dll | Bin 1606144 -> 1596928 bytes lib/GFSDK_SSAO_GL.win32.lib | Bin 2270 -> 2270 bytes lib/GFSDK_SSAO_GL.win64.dll | Bin 1716224 -> 1705984 bytes lib/GFSDK_SSAO_GL.win64.lib | Bin 2266 -> 2266 bytes lib/GFSDK_SSAO_GL.x86_64-linux-gnu.so | Bin 1050884 -> 0 bytes samples/D3D11/src/BinMeshReader.h | 2 +- samples/D3D11/src/GPUTimers.cpp | 2 +- samples/D3D11/src/GPUTimers.h | 2 +- samples/D3D11/src/SSAO11.cpp | 2 +- samples/D3D11/src/SceneRTs.h | 2 +- samples/D3D12/src/BinMeshReader.h | 2 +- samples/D3D12/src/Viewer.cpp | 13 +------- src/API.cpp | 2 +- src/AppState_DX11.cpp | 2 +- src/AppState_DX11.h | 2 +- src/AppState_GL.cpp | 2 +- src/AppState_GL.h | 2 +- src/BuildVersion.h | 2 +- src/Common.h | 2 +- src/Common_DX12.h | 2 +- src/Common_GL.h | 2 +- src/ConstantBuffers.cpp | 8 ++--- src/ConstantBuffers.h | 2 +- src/GLSLProgram.h | 2 +- src/InputDepthInfo.h | 2 +- src/InputNormalInfo.h | 2 +- src/InputViewport.h | 2 +- src/MathUtil.h | 2 +- src/MatrixView.h | 2 +- src/OutputInfo.h | 2 +- src/PerfMarkers.h | 2 +- src/PipelineStateObjects_DX12.cpp | 6 ++-- src/PipelineStateObjects_DX12.h | 4 ++- src/ProjectionMatrixInfo.cpp | 2 +- src/ProjectionMatrixInfo.h | 2 +- src/RandomTexture.cpp | 2 +- src/RandomTexture.h | 2 +- src/RenderOptions.h | 2 +- src/RenderTargets_DX11.h | 20 ++++++++++++- src/RenderTargets_DX12.h | 2 +- src/RenderTargets_GL.h | 2 +- src/Renderer_DX11.cpp | 2 +- src/Renderer_DX11.h | 2 +- src/Renderer_DX12.cpp | 11 +++++-- src/Renderer_DX12.h | 2 +- src/Renderer_GL.cpp | 2 +- src/Renderer_GL.h | 2 +- src/Shaders_DX11.cpp | 2 +- src/Shaders_DX11.h | 2 +- src/Shaders_DX12.cpp | 2 +- src/Shaders_DX12.h | 2 +- src/Shaders_GL.cpp | 2 +- src/Shaders_GL.h | 2 +- src/States_DX11.cpp | 2 +- src/States_DX11.h | 2 +- src/States_DX12.cpp | 33 +++------------------ src/States_DX12.h | 6 ++-- src/States_GL.cpp | 2 +- src/States_GL.h | 2 +- src/TextureUtil.h | 2 +- src/TimestampQueries.h | 2 +- src/UserTexture.h | 2 +- src/VAO_GL.h | 2 +- src/Viewports.h | 2 +- src/shaders/src/BlurX_PS.hlsl | 2 +- src/shaders/src/BlurY_PS.hlsl | 2 +- src/shaders/src/CoarseAO_GS.hlsl | 2 +- src/shaders/src/CoarseAO_PS.hlsl | 3 +- src/shaders/src/CopyDepth_PS.hlsl | 2 +- src/shaders/src/DebugAO_PS.hlsl | 2 +- src/shaders/src/DebugNormals_PS.hlsl | 2 +- src/shaders/src/DeinterleaveDepth_PS.hlsl | 2 +- src/shaders/src/FullScreenTriangle_VS.hlsl | 2 +- src/shaders/src/LinearizeDepth_PS.hlsl | 2 +- src/shaders/src/ReconstructNormal_PS.hlsl | 2 +- src/shaders/src/ReinterleaveAO_PS.hlsl | 2 +- src/shaders/src/SharedDefines.h | 2 +- 123 files changed, 274 insertions(+), 240 deletions(-) create mode 100644 build/platforms/vs2015/Resource.rc delete mode 100644 lib/GFSDK_SSAO_GL.osx.dylib delete mode 100644 lib/GFSDK_SSAO_GL.x86_64-linux-gnu.so 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 @@ + + + GFSDK_SSAO_D3D11 {94E21C5D-95F5-4096-AEE0-C7C51F7FE02A} @@ -83,8 +86,8 @@ MaxSpeed - $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include - SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) + $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include;$(ProjectDir)\..\..\..\src\NVAPI + SUPPORT_D3D11=1;USE_NVAPI=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) MultiThreaded Level4 true @@ -95,14 +98,15 @@ true $(OutDir)$(TargetName).pdb - 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) + 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) + $(ProjectDir)\..\..\..\src\NVAPI\x86 MultiThreaded - $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include - SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) + $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include;$(ProjectDir)\..\..\..\src\NVAPI + SUPPORT_D3D11=1;USE_NVAPI=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) Level4 true @@ -112,7 +116,8 @@ true $(OutDir)$(TargetName).pdb - 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) + 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) + $(ProjectDir)\..\..\..\src\NVAPI\amd64 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 @@ Source Files + + + \ 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 @@ + + + GFSDK_SSAO_D3D11_UWP {D213334C-5B95-414B-AED9-F203FFD1D00D} @@ -81,7 +84,7 @@ MaxSpeed $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include - SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) + SUPPORT_D3D11=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) MultiThreadedDLL Level4 true @@ -101,7 +104,7 @@ MultiThreadedDLL $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include - SUPPORT_D3D11=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) + SUPPORT_D3D11=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) Level4 true true 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 @@ Source Files + + + \ 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 @@ + + + GFSDK_SSAO_D3D12 {9E9A59CE-F50F-454A-A922-17324373A3A5} 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 @@ Source Files + + + \ 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 @@ + + + GFSDK_SSAO_D3D12_UWP {EBAE8F1C-7EBC-44AA-BF1A-B34F057A187F} @@ -82,7 +85,7 @@ MaxSpeed $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include - SUPPORT_D3D12=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) + SUPPORT_D3D12=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) MultiThreadedDLL Level3 true @@ -102,7 +105,7 @@ MultiThreadedDLL $(OUTPUT_DIR_LIB);$(ProjectDir)\..\..\..\include - SUPPORT_D3D12=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) + SUPPORT_D3D12=1;SUPPORT_UWP=1;_WINDLL;GLEW_STATIC;NDEBUG;_WINDOWS;UNICODE;%(PreprocessorDefinitions) Level3 true true 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 @@ Source Files + + + \ 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 @@ + + + GFSDK_SSAO_GL {5C00BDFE-5300-4BF1-BFC2-DAB7998C6DED} 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 @@ Source Files + + + \ 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 Binary files /dev/null and b/build/platforms/vs2015/Resource.rc differ diff --git a/doc/.buildinfo b/doc/.buildinfo index 5a19ffe..dcc432b 100644 --- a/doc/.buildinfo +++ b/doc/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: dc68e4490eb1fe0304cc688a6f2ca6f1 +config: 99127d59ee4b5414a3a9060c37f79b2d tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/doc/_sources/changelog.txt b/doc/_sources/changelog.txt index 5be28c4..98c0c31 100644 --- a/doc/_sources/changelog.txt +++ b/doc/_sources/changelog.txt @@ -4,6 +4,12 @@ Change Log |PRODUCTNAMEDOCRELEASEBOLD| +**New in release 3.1** + +* The D3D11 non-UWP DLL now calls NVAPI (when available) to disable any SLI transfers for all render targets. +* The D3D12 RenderAO call now resets the ScissorRect. +* The PowerExponent parameter is now clamped to 4.f (was 8.f). + **New in release 3.0** * Added entry points for D3D12. diff --git a/doc/changelog.html b/doc/changelog.html index a6978f9..048dea3 100644 --- a/doc/changelog.html +++ b/doc/changelog.html @@ -7,7 +7,7 @@ - Change Log — NVIDIA HBAO+ 3.0. documentation + Change Log — NVIDIA HBAO+ 3.1. documentation @@ -18,7 +18,7 @@ - - + +