From 33ebe3444090714901ba8159280e07ac670361bb Mon Sep 17 00:00:00 2001 From: Azaezel Date: Tue, 13 Mar 2018 21:25:45 -0500 Subject: [PATCH] more gfx shadowvar cleanups --- .../advanced/glsl/advancedLightingFeaturesGLSL.cpp | 2 +- .../advanced/hlsl/advancedLightingFeaturesHLSL.cpp | 4 ++-- .../source/lighting/shadowMap/pssmLightShadowMap.cpp | 2 +- Engine/source/materials/processedShaderMaterial.cpp | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp index f1223f7b0..9ac194cff 100644 --- a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp +++ b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp @@ -350,7 +350,7 @@ void DeferredBumpFeatGLSL::processPix( Vector &componentList, if (fd.features.hasFeature(MFT_DetailNormalMap)) { - Var *bumpMap = (Var*)LangElement::find("detailBumpMap"); + bumpMap = (Var*)LangElement::find("detailBumpMap"); if (!bumpMap) { bumpMap = new Var; bumpMap->setType("sampler2D"); diff --git a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp index 7255ea564..7e3564350 100644 --- a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp +++ b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp @@ -367,7 +367,7 @@ void DeferredBumpFeatHLSL::processPix( Vector &componentList, if ( fd.features.hasFeature( MFT_DetailNormalMap ) ) { - Var *bumpMap = (Var*)LangElement::find( "detailBumpMap" ); + bumpMap = (Var*)LangElement::find( "detailBumpMap" ); if ( !bumpMap ) { bumpMap = new Var; @@ -378,7 +378,7 @@ void DeferredBumpFeatHLSL::processPix( Vector &componentList, bumpMap->constNum = Var::getTexUnitNum(); } - Var* bumpMapTex = (Var*)LangElement::find("detailBumpMap"); + bumpMapTex = (Var*)LangElement::find("detailBumpMap"); if (!bumpMapTex) { bumpMap->setType("SamplerState"); diff --git a/Engine/source/lighting/shadowMap/pssmLightShadowMap.cpp b/Engine/source/lighting/shadowMap/pssmLightShadowMap.cpp index d276fe3a5..c9ac7e2e3 100644 --- a/Engine/source/lighting/shadowMap/pssmLightShadowMap.cpp +++ b/Engine/source/lighting/shadowMap/pssmLightShadowMap.cpp @@ -254,7 +254,7 @@ void PSSMLightShadowMap::_render( RenderPassManager* renderPass, for (U32 i = 0; i < mNumSplits; i++) { - GFXTransformSaver saver; + GFXTransformSaver splitSaver; // Calculate a sub-frustum Frustum subFrustum(fullFrustum); diff --git a/Engine/source/materials/processedShaderMaterial.cpp b/Engine/source/materials/processedShaderMaterial.cpp index 4fb2acc94..e433a354c 100644 --- a/Engine/source/materials/processedShaderMaterial.cpp +++ b/Engine/source/materials/processedShaderMaterial.cpp @@ -531,9 +531,9 @@ bool ProcessedShaderMaterial::_createPasses( MaterialFeatureData &stageFeatures, ShaderRenderPassData passData; U32 texIndex = 0; - for( U32 i=0; i < FEATUREMGR->getFeatureCount(); i++ ) + for( U32 featureIDx=0; featureIDx < FEATUREMGR->getFeatureCount(); featureIDx++ ) { - const FeatureInfo &info = FEATUREMGR->getAt( i ); + const FeatureInfo &info = FEATUREMGR->getAt(featureIDx); if ( !stageFeatures.features.hasFeature( *info.type ) ) continue; @@ -562,7 +562,7 @@ bool ProcessedShaderMaterial::_createPasses( MaterialFeatureData &stageFeatures, #if defined(TORQUE_DEBUG) && defined( TORQUE_OPENGL) if(oldTexNumber != texIndex) { - for(int i = oldTexNumber; i < texIndex; i++) + for(int texNum = oldTexNumber; texNum < texIndex; texNum++) { AssertFatal(passData.mSamplerNames[ oldTexNumber ].isNotEmpty(), avar( "ERROR: ShaderGen feature %s don't set used sampler name", info.feature->getName().c_str()) ); } @@ -579,9 +579,9 @@ bool ProcessedShaderMaterial::_createPasses( MaterialFeatureData &stageFeatures, } #if defined(TORQUE_DEBUG) && defined( TORQUE_OPENGL) - for(int i = 0; i < texIndex; i++) + for(int samplerIDx = 0; samplerIDx < texIndex; samplerIDx++) { - AssertFatal(passData.mSamplerNames[ i ].isNotEmpty(),""); + AssertFatal(passData.mSamplerNames[samplerIDx].isNotEmpty(),""); } #endif