v0.12.0 - AMD FidelityFX Super Resolution 3 Upscaler

.gitignore

@@ -14,7 +14,7 @@
 # Precompiled Headers
 *.gch
 *.pch
-Source/Renderer/Libs/AMDFidelityFX/CACAO/PrecompiledShadersDXIL/*
+Source/Renderer/Libs/AMD/CACAO/PrecompiledShadersDXIL/*
 
 # Compiled Dynamic libraries
 *.so

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "Data/Textures/PBR"]
 	path = Data/Textures/PBR
 	url = https://github.com/vilbeyli/PBRCollection.git
+[submodule "Source/Renderer/Libs/AMD/FidelityFX-SDK"]
+	path = Source/Renderer/Libs/AMD/FidelityFX-SDK
+	url = https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git

Build/GenerateProjectFiles.bat

@@ -73,10 +73,12 @@ set SUBMODULE_DIR0=..\Libs\VQUtils\
 set SUBMODULE_DIR1=..\Source\Renderer\Libs\D3D12MA\
 set SUBMODULE_DIR2=..\Source\Renderer\Libs\D3DX12\
 set SUBMODULE_DIR3=..\Libs\imgui\
+set SUBMODULE_DIR4=..\Source\Renderer\Libs\AMD\FidelityFX-SDK\
 set SUBMODULE_FILE_PATH0=!SUBMODULE_DIR0!!SUBMODULE_FILE!
 set SUBMODULE_FILE_PATH1=!SUBMODULE_DIR1!!SUBMODULE_FILE!
 set SUBMODULE_FILE_PATH2=!SUBMODULE_DIR2!
 set SUBMODULE_FILE_PATH3=!SUBMODULE_DIR3!!SUBMODULE_FILE!
+set SUBMODULE_FILE_PATH4=!SUBMODULE_DIR4!!SUBMODULE_FILE!
 
 :: walk thru submodule paths
 set MISSING_SUBMODULE_DIRS=
@@ -97,6 +99,10 @@ if not exist !SUBMODULE_FILE_PATH3! (
     set NEED_TO_INIT_SUBMODULES=1 
     set MISSING_SUBMODULE_DIRS=!MISSING_SUBMODULE_DIRS! !SUBMODULE_DIR3!,
 )
+if not exist !SUBMODULE_FILE_PATH4! ( 
+    set NEED_TO_INIT_SUBMODULES=1 
+    set MISSING_SUBMODULE_DIRS=!MISSING_SUBMODULE_DIRS! !SUBMODULE_DIR4!,
+)
 
 :: init submodules if necessary
 if !NEED_TO_INIT_SUBMODULES! neq 0 (
@@ -111,6 +117,7 @@ if !NEED_TO_INIT_SUBMODULES! neq 0 (
     git submodule update --init Libs/imgui
     git submodule update --init Libs/cgltf
     git submodule update --init Source/Renderer/Libs/D3DX12
+    git submodule update --init Source/Renderer/Libs/AMD/FidelityFX-SDK
     cd Build
 
     :: check if submodule initialized properly
@@ -119,6 +126,7 @@ if !NEED_TO_INIT_SUBMODULES! neq 0 (
     if not exist !SUBMODULE_FILE_PATH1! ( set NEED_TO_INIT_SUBMODULES=1 )
     if not exist !SUBMODULE_FILE_PATH2! ( set NEED_TO_INIT_SUBMODULES=1 )
     if not exist !SUBMODULE_FILE_PATH3! ( set NEED_TO_INIT_SUBMODULES=1 )
+    if not exist !SUBMODULE_FILE_PATH4! ( set NEED_TO_INIT_SUBMODULES=1 )
     if !NEED_TO_INIT_SUBMODULES! neq 0 (
         echo.
         echo [VQBuild]    Could not initialize submodule. Make sure all the submodules are initialized and updated.

CMakeLists.txt

@@ -112,11 +112,6 @@ set (SceneFiles
     "Source/Engine/Scene/Quaternion.cpp"
 )
 
-set (PostProcessFiles
-    "Source/Engine/PostProcess/PostProcess.h"
-    "Source/Engine/PostProcess/PostProcess.cpp"
-)
-
 set (UIFiles
     "Source/Engine/UI/VQUI.cpp"
     "Source/Engine/UI/VQUI.h"
@@ -177,7 +172,6 @@ source_group("Source\\Importer" FILES ${ImporterFiles})
 source_group("Source\\Core" FILES ${CoreFiles})
 source_group("Source\\Scene" FILES ${SceneFiles})
 source_group("Source\\UI" FILES ${UIFiles})
-source_group("Source\\PostProcess" FILES ${PostProcessFiles})
 source_group("Source" FILES ${SourceVQE})
 
 set_source_files_properties(${Config} PROPERTIES VS_TOOL_OVERRIDE "Text")
@@ -187,6 +181,7 @@ set_source_files_properties(${Materials} PROPERTIES VS_TOOL_OVERRIDE "Text")
 
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/Libs/VQUtils/Bin/)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/Libs/WinPixEventRuntime/bin/x64)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source/Renderer/Libs/AMD/FidelityFX-SDK/PrebuiltSignedDLL)
 
 # Create a library with the project name that is build with the Headers and Source files
 add_executable( ${PROJECT_NAME} 
@@ -227,7 +222,8 @@ set_target_properties(ImGUI PROPERTIES FOLDER Libs)
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${Includes})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${LibsIncl})
 
-target_link_libraries(${PROJECT_NAME} PRIVATE VQUtils VQRenderer WinPixEventRuntime ImGUI)
+target_link_libraries(${PROJECT_NAME} PRIVATE VQUtils VQRenderer WinPixEventRuntime ImGUI amd_fidelityfx_dx12)
+
 
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different

Data/EngineSettings.ini

@@ -2,7 +2,7 @@
 
 [Graphics]
 VSync=false
-RenderScale=1.0
+RenderResolutionScale=1.0
 TripleBuffer=true
 AntiAliasing=true
 Reflections=1

Data/Resources/VQE.rc

@@ -79,11 +79,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Volkan Ilbeyli @vilbeyli - GitHub/VQE"
             VALUE "FileDescription", "VQEngine Renderer Application"
-            VALUE "FileVersion", "0.11.0.0"
+            VALUE "FileVersion", "0.12.0.0"
             VALUE "InternalName", "VQE.exe"
             VALUE "OriginalFilename", "VQE.exe"
             VALUE "ProductName", "VQEngine"
-            VALUE "ProductVersion", "0.11.0.0"
+            VALUE "ProductVersion", "0.12.0.0"
         END
     END
     BLOCK "VarFileInfo"

README.md

@@ -262,7 +262,7 @@ VQE supports the following command line parameters:
 - [D3D12MA](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator)
 - [stb](https://github.com/nothings/stb)
 - [tinyxml2](https://github.com/leethomason/tinyxml2)
-- [cgltf][https://github.com/jkuhlmann/cgltf]
+- [cgltf](https://github.com/jkuhlmann/cgltf)
 - [WinPixEventRuntime](https://devblogs.microsoft.com/pix/winpixeventruntime/)
 - [Khronos glTF Sample Models](https://github.com/KhronosGroup/glTF-Sample-Models)
 - [cgbookcase PBR Textures](https://www.cgbookcase.com/)

Shaders/AMDFidelityFX.hlsl

@@ -57,7 +57,7 @@
 //
 //--------------------------------------------------------------------------------------
 #if FFXCAS_CS || FFXCAS_PS
-#include "AMDFidelityFX/CAS/ffx_a.h"
+#include "AMD/CAS/ffx_a.h"
 
 //
 // App-side Defines
@@ -114,7 +114,7 @@ cbuffer             CASConstants     : register(b0)
 
 
 
-#include "AMDFidelityFX/CAS/ffx_cas.h"
+#include "AMD/CAS/ffx_cas.h"
 
 //
 // CAS Main
@@ -183,7 +183,7 @@ void CAS_CSMain(uint3 LocalThreadId : SV_GroupThreadID, uint3 WorkGroupId : SV_G
 //
 //--------------------------------------------------------------------------------------
 #if FSR_EASU_CS || FSR_EASU_PS
-#include "AMDFidelityFX/FSR1.0/ffx_a.h"
+#include "AMD/FSR1.0/ffx_a.h"
 
 //
 // App-side Defines
@@ -238,7 +238,7 @@ SamplerState samLinearClamp : register(s0);
 
 
 
-#include "AMDFidelityFX/FSR1.0/ffx_fsr1.h"
+#include "AMD/FSR1.0/ffx_fsr1.h"
 
 
 //
@@ -304,7 +304,7 @@ cbuffer             RCASConstants : register(b0)
 	uint4 RCASConst0;
 }
 
-#include "AMDFidelityFX/FSR1.0/ffx_a.h"
+#include "AMD/FSR1.0/ffx_a.h"
 
 
 //
@@ -328,7 +328,7 @@ cbuffer             RCASConstants : register(b0)
 
 #endif // FSR_FP16
 
-#include "AMDFidelityFX/FSR1.0/ffx_fsr1.h"
+#include "AMD/FSR1.0/ffx_fsr1.h"
 //
 // RCAS
 //
@@ -518,7 +518,7 @@ AH4 SpdReduce4H(AH4 v0, AH4 v1, AH4 v2, AH4 v3)
 }
 #endif // A_HALF
 
-#include "AMDFidelityFX/SPD/ffx_spd.h"
+#include "AMD/SPD/ffx_spd.h"
 //
 // SPD Main
 //

Shaders/DepthPrePass.hlsl

@@ -84,11 +84,11 @@ Texture2D texHeightmap : register(t8);
 #if INSTANCED_DRAW
 matrix GetWorldMatrix(uint instID) { return cbPerObject.matWorld[instID]; }
 matrix GetWorldNormalMatrix(uint instID) { return cbPerObject.matNormal[instID]; }
-matrix GetWorldViewProjectionMatrix(uint instID) { return cbPerObject.matWorldViewProj[instID]; }
+matrix GetWorldViewProjectionMatrix(uint instID) { return cbPerObject.matJitteredWorldViewProj[instID]; }
 #else
 matrix GetWorldMatrix() { return cbPerObject.matWorld; }
 matrix GetWorldNormalMatrix() { return cbPerObject.matNormal; }
-matrix GetWorldViewProjectionMatrix() { return cbPerObject.matWorldViewProj; }
+matrix GetWorldViewProjectionMatrix() { return cbPerObject.matJitteredWorldViewProj; }
 #endif
 float2 GetUVScale() { return cbPerObject.materialData.uvScaleOffset.xy; }
 float2 GetUVOffset() { return cbPerObject.materialData.uvScaleOffset.zw; }

Shaders/DownsampleDepth.hlsl

@@ -50,7 +50,7 @@ cbuffer cbDownsampleDepth
 
 #define A_GPU
 #define A_HLSL
-#include "AMDFidelityFX/SPD/ffx_a.h"
+#include "AMD/SPD/ffx_a.h"
 
 groupshared float g_group_shared_depth_values[16][16];
 groupshared uint g_group_shared_counter;
@@ -71,7 +71,7 @@ AF4 SpdLoadIntermediate(AU1 x, AU1 y) {
 void SpdStoreIntermediate(AU1 x, AU1 y, AF4 value) { g_group_shared_depth_values[x][y] = value.x; }
 AF4 SpdReduce4(AF4 v0, AF4 v1, AF4 v2, AF4 v3) { return min(min(v0, v1), min(v2, v3)); }
 
-#include "AMDFidelityFX/SPD/ffx_spd.h"
+#include "AMD/SPD/ffx_spd.h"
 
 uint GetThreadgroupCount(uint2 image_size) {
 	// Each threadgroup works on 64x64 texels

Shaders/ForwardLighting.hlsl

@@ -56,14 +56,27 @@ struct PSInput
 struct PSOutput
 {
 	float4 color : SV_TARGET0;
+
 #if PS_OUTPUT_ALBEDO_METALLIC
 	float4 albedo_metallic : SV_TARGET1;
 #endif
 
-#if PS_OUTPUT_ALBEDO_METALLIC && PS_OUTPUT_MOTION_VECTORS
+#if PS_OUTPUT_MOTION_VECTORS
+	#if PS_OUTPUT_ALBEDO_METALLIC
 	float2 motion_vectors : SV_TARGET2;
-#elif !PS_OUTPUT_ALBEDO_METALLIC && PS_OUTPUT_MOTION_VECTORS
+	#else
 	float2 motion_vectors : SV_TARGET1;
+	#endif
+#endif
+
+#if PS_OUTPUT_MASK
+	#if PS_OUTPUT_ALBEDO_METALLIC && PS_OUTPUT_MOTION_VECTORS
+		float transparencyAndCompositionMask : SV_TARGET3;
+	#elif S_OUTPUT_ALBEDO_METALLIC || PS_OUTPUT_MOTION_VECTORS
+		float transparencyAndCompositionMask : SV_TARGET2;
+	#else
+		float transparencyAndCompositionMask : SV_TARGET1;
+	#endif
 #endif
 };
 
@@ -119,13 +132,15 @@ TextureCubeArray texPointLightShadowMaps      : register(t22);
 matrix GetWorldMatrix(uint instID) { return cbPerObject.matWorld[instID]; }
 matrix GetWorldNormalMatrix(uint instID) { return cbPerObject.matNormal[instID]; }
 matrix GetWorldViewProjectionMatrix(uint instID) { return cbPerObject.matWorldViewProj[instID]; }
+matrix GetJitteredWorldViewProjectionMatrix(uint instID) { return cbPerObject.matJitteredWorldViewProj[instID]; }
 #if PS_OUTPUT_MOTION_VECTORS
 matrix GetPrevWorldViewProjectionMatrix(uint instID) { return cbPerObject.matWorldViewProjPrev[instID]; }
 #endif
 #else
 matrix GetWorldMatrix() { return cbPerObject.matWorld; }
 matrix GetWorldNormalMatrix() { return cbPerObject.matNormal; }
 matrix GetWorldViewProjectionMatrix() { return cbPerObject.matWorldViewProj; }
+matrix GetJitteredWorldViewProjectionMatrix() { return cbPerObject.matJitteredWorldViewProj; }
 #if PS_OUTPUT_MOTION_VECTORS
 matrix GetPrevWorldViewProjectionMatrix() { return cbPerObject.matWorldViewProjPrev; }
 #endif
@@ -155,35 +170,36 @@ PSInput TransformVertex(
 
 #if INSTANCED_DRAW
 	matrix matW   = GetWorldMatrix(InstanceID);
-	matrix matWVP = GetWorldViewProjectionMatrix(InstanceID);
+	matrix matJWVP = GetJitteredWorldViewProjectionMatrix(InstanceID);
 	matrix matWN = GetWorldNormalMatrix(InstanceID);
 
 	#if PS_OUTPUT_MOTION_VECTORS
+	matrix matWVP = GetWorldViewProjectionMatrix(InstanceID);
 	matrix matPrevWVP = GetPrevWorldViewProjectionMatrix(InstanceID);
 	#endif
 #else
 	matrix matW   = GetWorldMatrix();
-	matrix matWVP = GetWorldViewProjectionMatrix();
+	matrix matJWVP = GetJitteredWorldViewProjectionMatrix();
 	matrix matWN = GetWorldNormalMatrix();
 	#if PS_OUTPUT_MOTION_VECTORS
+	matrix matWVP = GetWorldViewProjectionMatrix();
 	matrix matPrevWVP = GetPrevWorldViewProjectionMatrix();
 	#endif
 #endif // INSTANCED_DRAW
 
 	PSInput result;
-	result.position = mul(matWVP, vPosition);
+	result.position = mul(matJWVP, vPosition);
 	result.WorldSpacePosition = mul(matW, vPosition).xyz;
 	result.WorldSpaceNormal = mul((float4x3)matWN, Normal).xyz;
 	result.WorldSpaceTangent = mul((float4x3)matWN, Tangent).xyz;
-	#if PS_OUTPUT_MOTION_VECTORS
+#if PS_OUTPUT_MOTION_VECTORS
 	result.svPositionPrev = mul(matPrevWVP, vPosition);
-	#endif
+#endif
 	result.uv = uv;
 
 #if PS_OUTPUT_MOTION_VECTORS
-	result.svPositionCurr = result.position;
+	result.svPositionCurr = mul(matWVP, vPosition);
 #endif
-
 	return result;
 }
 
@@ -225,14 +241,15 @@ PSOutput PSMain(PSInput In)
 
 	const float2 uv = In.uv * cbPerObject.materialData.uvScaleOffset.xy + cbPerObject.materialData.uvScaleOffset.zw;
 	const int TEX_CFG = cbPerObject.materialData.textureConfig;
+	const float MipBias = OverrideGlobalMipBias(TEX_CFG) ? cbPerObject.materialData.mipMapBias : cbPerFrame.fGlobalMipBias;
 
-	float4 AlbedoAlpha = texDiffuse  .Sample(AnisoSampler, uv);
+	float4 AlbedoAlpha = texDiffuse.SampleBias(AnisoSampler, uv, MipBias);
 	float3 Normal      = texNormals.SampleBias(AnisoSampler, uv, cbPerObject.materialData.normalMapMipBias).rgb;
-	float3 Emissive    = texEmissive .Sample(LinearSampler, uv).rgb;
-	float  Metalness   = texMetalness.Sample(AnisoSampler, uv).r;
-	float  Roughness   = texRoughness.Sample(AnisoSampler, uv).r;
-	float3 OcclRghMtl  = texOcclRoughMetal.Sample(AnisoSampler, uv).rgb;
-	float LocalAO      = texLocalAO.Sample(AnisoSampler, uv).r;
+	float3 Emissive    = texEmissive.SampleBias(LinearSampler, uv, MipBias).rgb;
+	float  Metalness   = texMetalness.SampleBias(AnisoSampler, uv, MipBias).r;
+	float  Roughness   = texRoughness.SampleBias(AnisoSampler, uv, MipBias).r;
+	float3 OcclRghMtl  = texOcclRoughMetal.SampleBias(AnisoSampler, uv, MipBias).rgb;
+	float LocalAO      = texLocalAO.SampleBias(AnisoSampler, uv, MipBias).r;
 
 	#if ENABLE_ALPHA_MASK
 	if (HasDiffuseMap(TEX_CFG) && AlbedoAlpha.a < 0.01f)
@@ -383,9 +400,11 @@ PSOutput PSMain(PSInput In)
 	o.albedo_metallic = float4(Surface.diffuseColor, Surface.metalness);
 	#endif
 	#if PS_OUTPUT_MOTION_VECTORS
-	//o.motion_vectors = float2(0.77777777777777, 0.8888888888888888); // debug output
 	o.motion_vectors = float2(In.svPositionCurr.xy / In.svPositionCurr.w - In.svPositionPrev.xy / In.svPositionPrev.w);
 	#endif
+	#if PS_OUTPUT_MASK
+	o.transparencyAndCompositionMask = 1.0f;
+	#endif
 
 	return o;
 }