From 2e112802e574e259a773b27bffcb830d5aa79c36 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Sat, 29 Nov 2014 21:44:05 -0600 Subject: [PATCH] DeferredMinnaert feautre was missing samplernames --- .../lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp | 5 +++-- .../lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp index c5f85234a..f931638d6 100644 --- a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp +++ b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp @@ -532,8 +532,9 @@ void DeferredMinnaertGLSL::setTexData( Material::StageData &stageDat, NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); if ( texTarget ) { - passData.mTexType[ texIndex ] = Material::TexTarget; - passData.mTexSlot[ texIndex++ ].texTarget = texTarget; + passData.mTexType[texIndex] = Material::TexTarget; + passData.mSamplerNames[texIndex] = "prepassBuffer"; + passData.mTexSlot[ texIndex++ ].texTarget = texTarget; } } } diff --git a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp index 661530bf3..60d9dcfdb 100644 --- a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp +++ b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp @@ -532,8 +532,9 @@ void DeferredMinnaertHLSL::setTexData( Material::StageData &stageDat, NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); if ( texTarget ) { - passData.mTexType[ texIndex ] = Material::TexTarget; - passData.mTexSlot[ texIndex++ ].texTarget = texTarget; + passData.mTexType[texIndex] = Material::TexTarget; + passData.mSamplerNames[texIndex] = "prepassBuffer"; + passData.mTexSlot[ texIndex++ ].texTarget = texTarget; } } }