From 2c0a57449e05a4246cc1622aa576fba0970b9e09 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Wed, 26 Sep 2018 06:49:36 -0500 Subject: [PATCH 1/3] filter out pixel shader normalmap calcs when not in deferred mode. --- Engine/source/terrain/glsl/terrFeatureGLSL.cpp | 3 +++ Engine/source/terrain/hlsl/terrFeatureHLSL.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp index 2acd40871..6eb0c8c1a 100644 --- a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp +++ b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp @@ -927,6 +927,9 @@ void TerrainNormalMapFeatGLSL::processVert( Vector &component void TerrainNormalMapFeatGLSL::processPix( Vector &componentList, const MaterialFeatureData &fd ) { + // We only need to process normals during the deferred. + if (!fd.features.hasFeature(MFT_DeferredConditioner)) + return; MultiLine *meta = new MultiLine; diff --git a/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp b/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp index f4a0b7d5d..3b05a30f7 100644 --- a/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp +++ b/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp @@ -908,6 +908,9 @@ void TerrainNormalMapFeatHLSL::processVert( Vector &component void TerrainNormalMapFeatHLSL::processPix( Vector &componentList, const MaterialFeatureData &fd ) { + // We only need to process normals during the deferred. + if (!fd.features.hasFeature(MFT_DeferredConditioner)) + return; MultiLine *meta = new MultiLine; From 6ba442bf07372db555f9fd2073ec95d1d801925c Mon Sep 17 00:00:00 2001 From: Brian Roberts Date: Mon, 29 Oct 2018 13:21:42 -0500 Subject: [PATCH 2/3] Update terrFeatureGLSL.cpp --- Engine/source/terrain/glsl/terrFeatureGLSL.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp index 6eb0c8c1a..7a4755d03 100644 --- a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp +++ b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp @@ -927,9 +927,9 @@ void TerrainNormalMapFeatGLSL::processVert( Vector &component void TerrainNormalMapFeatGLSL::processPix( Vector &componentList, const MaterialFeatureData &fd ) { - // We only need to process normals during the deferred. - if (!fd.features.hasFeature(MFT_DeferredConditioner)) - return; + // We only need to process normals during the deferred. + if (!fd.features.hasFeature(MFT_DeferredConditioner)) + return; MultiLine *meta = new MultiLine; From 4453a4ad4b2117e726fe972a39a8562de5f2f38f Mon Sep 17 00:00:00 2001 From: Brian Roberts Date: Mon, 29 Oct 2018 13:22:16 -0500 Subject: [PATCH 3/3] Update terrFeatureHLSL.cpp --- Engine/source/terrain/hlsl/terrFeatureHLSL.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp b/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp index 3b05a30f7..e0039f8af 100644 --- a/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp +++ b/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp @@ -908,9 +908,9 @@ void TerrainNormalMapFeatHLSL::processVert( Vector &component void TerrainNormalMapFeatHLSL::processPix( Vector &componentList, const MaterialFeatureData &fd ) { - // We only need to process normals during the deferred. - if (!fd.features.hasFeature(MFT_DeferredConditioner)) - return; + // We only need to process normals during the deferred. + if (!fd.features.hasFeature(MFT_DeferredConditioner)) + return; MultiLine *meta = new MultiLine;