aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/GFSDK_SSAO.h6
-rw-r--r--lib/GFSDK_SSAO_D3D11.win32.dllbin955904 -> 955904 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D11.win32.libbin2328 -> 2328 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D11.win64.dllbin1063936 -> 1063936 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D11.win64.libbin2326 -> 2326 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D11_UWP.win32.dllbin467456 -> 468480 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D11_UWP.win32.libbin2384 -> 2384 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D11_UWP.win64.dllbin477696 -> 478720 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D11_UWP.win64.libbin2382 -> 2382 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12.win32.dllbin969728 -> 969728 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12.win32.libbin2328 -> 2328 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12.win64.dllbin1075200 -> 1075200 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12.win64.libbin2326 -> 2326 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12_UWP.win32.dllbin477184 -> 478208 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12_UWP.win32.libbin2384 -> 2384 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12_UWP.win64.dllbin485376 -> 486400 bytes
-rw-r--r--lib/GFSDK_SSAO_D3D12_UWP.win64.libbin2382 -> 2382 bytes
-rw-r--r--lib/GFSDK_SSAO_GL.osx.dylibbin2069356 -> 2069356 bytes
-rw-r--r--lib/GFSDK_SSAO_GL.win32.dllbin1595904 -> 1595904 bytes
-rw-r--r--lib/GFSDK_SSAO_GL.win32.libbin2270 -> 2270 bytes
-rw-r--r--lib/GFSDK_SSAO_GL.win64.dllbin1702400 -> 1702400 bytes
-rw-r--r--lib/GFSDK_SSAO_GL.win64.libbin2266 -> 2266 bytes
-rw-r--r--lib/GFSDK_SSAO_GL.x86_64-linux-gnu.sobin1050884 -> 1050884 bytes
-rw-r--r--src/ConstantBuffers.cpp4
-rw-r--r--src/RenderTargets_DX12.h1
-rw-r--r--src/Shaders_DX12.h1
26 files changed, 5 insertions, 7 deletions
diff --git a/include/GFSDK_SSAO.h b/include/GFSDK_SSAO.h
index 97c7fa0..cdaec09 100644
--- a/include/GFSDK_SSAO.h
+++ b/include/GFSDK_SSAO.h
@@ -198,7 +198,7 @@ struct GFSDK_SSAO_Version
: Major(3)
, Minor(0)
, Branch(0)
- , Revision(20573789)
+ , Revision(20666007)
{
}
@@ -641,8 +641,8 @@ struct GFSDK_SSAO_Parameters
{
GFSDK_SSAO_FLOAT Radius; // The AO radius in meters
GFSDK_SSAO_FLOAT Bias; // To hide low-tessellation artifacts // 0.0~0.5
- GFSDK_SSAO_FLOAT NearAO; // Scale factor for the near-range AO, the greater the darker // 1.0~4.0
- GFSDK_SSAO_FLOAT FarAO; // Scale factor for the far-range AO, the greater the darker // 1.0~4.0
+ GFSDK_SSAO_FLOAT NearAO; // Scale factor for the near-range AO, the greater the darker // 0.0~4.0
+ GFSDK_SSAO_FLOAT FarAO; // Scale factor for the far-range AO, the greater the darker // 0.0~4.0
GFSDK_SSAO_FLOAT PowerExponent; // The final AO output is pow(AO, powerExponent) // 1.0~8.0
GFSDK_SSAO_ForegroundAO ForegroundAO; // To limit the occlusion scale in the foreground
GFSDK_SSAO_BackgroundAO BackgroundAO; // To add larger-scale occlusion in the distance
diff --git a/lib/GFSDK_SSAO_D3D11.win32.dll b/lib/GFSDK_SSAO_D3D11.win32.dll
index 5b22635..dc47323 100644
--- a/lib/GFSDK_SSAO_D3D11.win32.dll
+++ b/lib/GFSDK_SSAO_D3D11.win32.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D11.win32.lib b/lib/GFSDK_SSAO_D3D11.win32.lib
index 1d05b4f..6ad6ab1 100644
--- a/lib/GFSDK_SSAO_D3D11.win32.lib
+++ b/lib/GFSDK_SSAO_D3D11.win32.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D11.win64.dll b/lib/GFSDK_SSAO_D3D11.win64.dll
index 96ab044..8a9d16a 100644
--- a/lib/GFSDK_SSAO_D3D11.win64.dll
+++ b/lib/GFSDK_SSAO_D3D11.win64.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D11.win64.lib b/lib/GFSDK_SSAO_D3D11.win64.lib
index 8bb279e..5767605 100644
--- a/lib/GFSDK_SSAO_D3D11.win64.lib
+++ b/lib/GFSDK_SSAO_D3D11.win64.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D11_UWP.win32.dll b/lib/GFSDK_SSAO_D3D11_UWP.win32.dll
index 7d4d7bb..fa8444a 100644
--- a/lib/GFSDK_SSAO_D3D11_UWP.win32.dll
+++ b/lib/GFSDK_SSAO_D3D11_UWP.win32.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D11_UWP.win32.lib b/lib/GFSDK_SSAO_D3D11_UWP.win32.lib
index 024b105..e347479 100644
--- a/lib/GFSDK_SSAO_D3D11_UWP.win32.lib
+++ b/lib/GFSDK_SSAO_D3D11_UWP.win32.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D11_UWP.win64.dll b/lib/GFSDK_SSAO_D3D11_UWP.win64.dll
index 9803666..d887fbe 100644
--- a/lib/GFSDK_SSAO_D3D11_UWP.win64.dll
+++ b/lib/GFSDK_SSAO_D3D11_UWP.win64.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D11_UWP.win64.lib b/lib/GFSDK_SSAO_D3D11_UWP.win64.lib
index 5446b44..12aea49 100644
--- a/lib/GFSDK_SSAO_D3D11_UWP.win64.lib
+++ b/lib/GFSDK_SSAO_D3D11_UWP.win64.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12.win32.dll b/lib/GFSDK_SSAO_D3D12.win32.dll
index ac6c91c..ac8fe40 100644
--- a/lib/GFSDK_SSAO_D3D12.win32.dll
+++ b/lib/GFSDK_SSAO_D3D12.win32.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12.win32.lib b/lib/GFSDK_SSAO_D3D12.win32.lib
index 1a49fa3..141ed14 100644
--- a/lib/GFSDK_SSAO_D3D12.win32.lib
+++ b/lib/GFSDK_SSAO_D3D12.win32.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12.win64.dll b/lib/GFSDK_SSAO_D3D12.win64.dll
index 972a485..9190a3e 100644
--- a/lib/GFSDK_SSAO_D3D12.win64.dll
+++ b/lib/GFSDK_SSAO_D3D12.win64.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12.win64.lib b/lib/GFSDK_SSAO_D3D12.win64.lib
index c160ce8..9799b95 100644
--- a/lib/GFSDK_SSAO_D3D12.win64.lib
+++ b/lib/GFSDK_SSAO_D3D12.win64.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12_UWP.win32.dll b/lib/GFSDK_SSAO_D3D12_UWP.win32.dll
index 8a6a2c5..f1ebd9f 100644
--- a/lib/GFSDK_SSAO_D3D12_UWP.win32.dll
+++ b/lib/GFSDK_SSAO_D3D12_UWP.win32.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12_UWP.win32.lib b/lib/GFSDK_SSAO_D3D12_UWP.win32.lib
index ed36b2b..0153d50 100644
--- a/lib/GFSDK_SSAO_D3D12_UWP.win32.lib
+++ b/lib/GFSDK_SSAO_D3D12_UWP.win32.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12_UWP.win64.dll b/lib/GFSDK_SSAO_D3D12_UWP.win64.dll
index ddf91e3..66175f5 100644
--- a/lib/GFSDK_SSAO_D3D12_UWP.win64.dll
+++ b/lib/GFSDK_SSAO_D3D12_UWP.win64.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_D3D12_UWP.win64.lib b/lib/GFSDK_SSAO_D3D12_UWP.win64.lib
index 116e9cc..e481c8e 100644
--- a/lib/GFSDK_SSAO_D3D12_UWP.win64.lib
+++ b/lib/GFSDK_SSAO_D3D12_UWP.win64.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_GL.osx.dylib b/lib/GFSDK_SSAO_GL.osx.dylib
index 7211f6e..2340f28 100644
--- a/lib/GFSDK_SSAO_GL.osx.dylib
+++ b/lib/GFSDK_SSAO_GL.osx.dylib
Binary files differ
diff --git a/lib/GFSDK_SSAO_GL.win32.dll b/lib/GFSDK_SSAO_GL.win32.dll
index fed6966..e87c3b2 100644
--- a/lib/GFSDK_SSAO_GL.win32.dll
+++ b/lib/GFSDK_SSAO_GL.win32.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_GL.win32.lib b/lib/GFSDK_SSAO_GL.win32.lib
index 2a76060..3d7c646 100644
--- a/lib/GFSDK_SSAO_GL.win32.lib
+++ b/lib/GFSDK_SSAO_GL.win32.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_GL.win64.dll b/lib/GFSDK_SSAO_GL.win64.dll
index 4f08a63..1ca4664 100644
--- a/lib/GFSDK_SSAO_GL.win64.dll
+++ b/lib/GFSDK_SSAO_GL.win64.dll
Binary files differ
diff --git a/lib/GFSDK_SSAO_GL.win64.lib b/lib/GFSDK_SSAO_GL.win64.lib
index 281f26a..163937d 100644
--- a/lib/GFSDK_SSAO_GL.win64.lib
+++ b/lib/GFSDK_SSAO_GL.win64.lib
Binary files differ
diff --git a/lib/GFSDK_SSAO_GL.x86_64-linux-gnu.so b/lib/GFSDK_SSAO_GL.x86_64-linux-gnu.so
index 182ba07..b04b9d9 100644
--- a/lib/GFSDK_SSAO_GL.x86_64-linux-gnu.so
+++ b/lib/GFSDK_SSAO_GL.x86_64-linux-gnu.so
Binary files differ
diff --git a/src/ConstantBuffers.cpp b/src/ConstantBuffers.cpp
index 57f51ab..1d9235b 100644
--- a/src/ConstantBuffers.cpp
+++ b/src/ConstantBuffers.cpp
@@ -77,8 +77,8 @@ void GFSDK::SSAO::GlobalConstants::SetAOParameters(const GFSDK_SSAO_Parameters&
m_Data.fNDotVBias = Clamp(Params.Bias, 0.0f, 0.5f);
const float AOAmountScaleFactor = 1.f / (1.f - m_Data.fNDotVBias);
- m_Data.fNearAOAmount = Clamp(Params.NearAO, 1.f, 4.f) * AOAmountScaleFactor * 2.f;
- m_Data.fFarAOAmount = Clamp(Params.FarAO, 1.f, 4.f) * AOAmountScaleFactor;
+ m_Data.fNearAOAmount = Clamp(Params.NearAO, 0.f, 4.f) * AOAmountScaleFactor * 2.f;
+ m_Data.fFarAOAmount = Clamp(Params.FarAO, 0.f, 4.f) * AOAmountScaleFactor;
}
//--------------------------------------------------------------------------------
diff --git a/src/RenderTargets_DX12.h b/src/RenderTargets_DX12.h
index 3599a87..4ba4901 100644
--- a/src/RenderTargets_DX12.h
+++ b/src/RenderTargets_DX12.h
@@ -175,7 +175,6 @@ public:
RTTexture2DArray()
: RTTexture2D()
{
- // @jihoc How to initialize handles?
ZERO_ARRAY(SRVs);
ZERO_ARRAY(RTVs);
}
diff --git a/src/Shaders_DX12.h b/src/Shaders_DX12.h
index a210296..89a6ce3 100644
--- a/src/Shaders_DX12.h
+++ b/src/Shaders_DX12.h
@@ -24,7 +24,6 @@ struct VertexShader
{
VertexShader()
{
- // Use proper heap here @jihoc
VS.BytecodeLength = 0;
VS.pShaderBytecode = nullptr;
}