GITechDemo:

*added sanity checks for textures that are required to generate GBuffer
*moved sky pass after SSR in order to avoid reflecting the sun and sky
*removed lens distortion effect due to blurring
*updated Sponza model with some geometry to make volumetric lighting more prominent

Author: iftodebogdan

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DirectionalLightPass.cpp

@@ -93,6 +93,8 @@ void DirectionalLightPass::Update(const float fDeltaTime)
 
     texIrradianceMap = IrradianceTexture.GetTextureIndex();
     texEnvMap = EnvironmentTexture.GetTextureIndex();
+
+    nBRDFModel = gmtl::Math::clamp(nBRDFModel.GetCurrentValue(), (int)BLINN_PHONG, (int)BRDF_MODEL_MAX - 1);
 }
 
 void DirectionalLightPass::Draw()

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/GBufferPass.cpp

@@ -97,6 +97,8 @@ void GBufferPass::Update(const float fDeltaTime)
     ResourceMgr->GetTexture(LinearFullDepthBuffer.GetRenderTarget()->GetColorBuffer())->SetFilter(SF_MIN_MAG_POINT_MIP_NONE);
     ResourceMgr->GetTexture(LinearQuarterDepthBuffer.GetRenderTarget()->GetColorBuffer())->SetFilter(SF_MIN_MAG_POINT_MIP_NONE);
     ResourceMgr->GetTexture(HyperbolicQuarterDepthBuffer.GetRenderTarget()->GetColorBuffer())->SetFilter(SF_MIN_MAG_POINT_MIP_NONE);
+
+    DIFFUSE_ANISOTROPY = Math::clamp(DIFFUSE_ANISOTROPY, 1, (int)MAX_ANISOTROPY);
 }
 
 void GBufferPass::Draw()
@@ -151,27 +153,33 @@ void GBufferPass::Draw()
     {
         PUSH_PROFILE_MARKER(SponzaScene.GetModel()->arrMaterial[SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx]->szName.c_str());
 
-        DIFFUSE_ANISOTROPY = Math::clamp(DIFFUSE_ANISOTROPY, 1, (int)MAX_ANISOTROPY);
-        RenderContext->GetResourceManager()->GetTexture(
-            SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_DIFFUSE, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx)
-            )->SetAnisotropy((unsigned int)DIFFUSE_ANISOTROPY);
+        const unsigned int diffuseTexIdx = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_DIFFUSE, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
+        const unsigned int normalTexIdx = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_HEIGHT, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
+        const unsigned int specTexIdx = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_SPECULAR, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
+        const unsigned int matTexIdx = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_AMBIENT, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
+        const unsigned int roughnessTexIdx = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_SHININESS, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
+
+        if (diffuseTexIdx != ~0u && ((texMatType != ~0u && texRoughness != ~0u) || nBRDFModel == BLINN_PHONG))
+        {
+            RenderContext->GetResourceManager()->GetTexture(diffuseTexIdx)->SetAnisotropy((unsigned int)DIFFUSE_ANISOTROPY);
 
-        texDiffuse = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_DIFFUSE, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
-        texNormal = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_HEIGHT, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
-        bHasNormalMap = (texNormal != -1) && GBUFFER_USE_NORMAL_MAPS;
+            texDiffuse = diffuseTexIdx;
+            texNormal = normalTexIdx;
+            bHasNormalMap = (texNormal != -1) && GBUFFER_USE_NORMAL_MAPS;
 
-        // For Blinn-Phong BRDF
-        texSpec = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_SPECULAR, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
-        bHasSpecMap = (texSpec != -1);
-        fSpecIntensity = SponzaScene.GetModel()->arrMaterial[SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx]->fShininessStrength;
+            // For Blinn-Phong BRDF
+            texSpec = (nBRDFModel == BLINN_PHONG ? specTexIdx : ~0u);
+            bHasSpecMap = (texSpec != -1);
+            fSpecIntensity = SponzaScene.GetModel()->arrMaterial[SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx]->fShininessStrength;
 
-        // For Cook-Torrance BRDF
-        texMatType = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_AMBIENT, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
-        texRoughness = SponzaScene.GetTexture(Synesthesia3D::Model::TextureDesc::TT_SHININESS, SponzaScene.GetModel()->arrMesh[mesh]->nMaterialIdx);
+            // For Cook-Torrance BRDF
+            texMatType = (nBRDFModel == COOK_TORRANCE_GGX || nBRDFModel == COOK_TORRANCE_BECKMANN ? matTexIdx : ~0u);
+            texRoughness = (nBRDFModel == COOK_TORRANCE_GGX || nBRDFModel == COOK_TORRANCE_BECKMANN ? roughnessTexIdx : ~0u);
 
-        GBufferGenerationShader.Enable();
-        RenderContext->DrawVertexBuffer(SponzaScene.GetModel()->arrMesh[mesh]->pVertexBuffer);
-        GBufferGenerationShader.Disable();
+            GBufferGenerationShader.Enable();
+            RenderContext->DrawVertexBuffer(SponzaScene.GetModel()->arrMesh[mesh]->pVertexBuffer);
+            GBufferGenerationShader.Disable();
+        }
 
         POP_PROFILE_MARKER();
     }

GITechDemo/Code/AppMain/GITechDemo/RenderScheme/RenderScheme.cpp

@@ -63,10 +63,6 @@ CREATE_ROOT_PASS()
         // Screen space ambient occlusion (done here so as not to affect indirect and volumetric lights)
         #include "SSAOPass.h"
         ADD_RENDER_PASS(SSAO_PASS, SSAOPass, "SSAO", LIGHTING_PASS)
-    
-        // Render the sky box (moved after SSAO so as to avoid halo artifacts on the sky)
-        #include "SkyPass.h"
-        ADD_RENDER_PASS(SKY_PASS, SkyPass, "Sky", LIGHTING_PASS)
 
         // Compute indirect light contribution from the directional light (1 unoccluded bounce)
         #include "DirectionalIndirectLightPass.h"
@@ -75,6 +71,10 @@ CREATE_ROOT_PASS()
         // Screen space reflection
         #include "ScreenSpaceReflectionPass.h"
         ADD_RENDER_PASS(SCREEN_SPACE_REFLECTION_PASS, ScreenSpaceReflectionPass, "Screen Space Reflection", LIGHTING_PASS)
+    
+        // Render the sky box (moved after SSAO so as to avoid halo artifacts on the sky; moved after SSR to avoid reflecting sun or sky)
+        #include "SkyPass.h"
+        ADD_RENDER_PASS(SKY_PASS, SkyPass, "Sky", LIGHTING_PASS)
 
         // Downsample the light accumulation buffer here, because we don't want the volumetric light to be bloomed
         #include "HDRDownsampleForBloomPass.h"

GITechDemo/Code/AppMain/GITechDemo/Resources/AppResources.cpp

@@ -447,8 +447,8 @@ namespace GITechDemoApp
     CREATE_SHADER_CONSTANT_OBJECT(fVignIn,                  float,          0.f                     );
     CREATE_SHADER_CONSTANT_OBJECT(fVignFade,                float,          22.f                    );
     CREATE_SHADER_CONSTANT_OBJECT(fChromaShiftAmount,       float,          3.f                     );
-    CREATE_SHADER_CONSTANT_OBJECT(fQuarticDistortionCoef,   float,          -0.02f                  );
-    CREATE_SHADER_CONSTANT_OBJECT(fCubicDistortionModifier, float,          -0.03f                  );
+    CREATE_SHADER_CONSTANT_OBJECT(fQuarticDistortionCoef,   float,          0.f                     );
+    CREATE_SHADER_CONSTANT_OBJECT(fCubicDistortionModifier, float,          0.f                     );
     CREATE_SHADER_CONSTANT_OBJECT(fDistortionScale,         float,          1.f                     );
     // Motion blur
     CREATE_SHADER_CONSTANT_OBJECT(fMotionBlurIntensity,     float,          0.01f                   );

GITechDemo/Code/AppMain/GITechDemo/Resources/AppResources.h

@@ -373,7 +373,8 @@ namespace GITechDemoApp
     {
         BLINN_PHONG = 0,
         COOK_TORRANCE_GGX,
-        COOK_TORRANCE_BECKMANN
+        COOK_TORRANCE_BECKMANN,
+        BRDF_MODEL_MAX
     };
 }
 

GITechDemo/Data/shaders/ScreenSpaceReflection.hlsl

@@ -71,8 +71,10 @@ void psmain(VSOut input, out float4 f4Color : SV_TARGET)
 {
     float2 f2HitTexelCoord; float3 f3HitPoint; f4Color = 0;
 
+    const float     fDepth = tex2D(texLinDepthBuffer, input.f2TexCoord).r;
+    DEPTH_KILL(fDepth, fZFar * 0.999f);
+
     const float3    f3ViewDir           = normalize(input.f3ViewVec);
-    const float     fDepth              = tex2D(texLinDepthBuffer, input.f2TexCoord).r;
     const float3    f3Normal            = DecodeNormal(tex2D(texNormalBuffer, input.f2TexCoord));
     const float3    f3RayStartPosVS     = input.f3ViewVec * fDepth + f3Normal * max(0.01f * fDepth, 0.001f);
     const float3    f3ReflectedRayDir   = reflect(f3ViewDir, f3Normal);