Merge pull request #983 from Azaezel/stray_mSamplerNames

DeferredMinnaert feautre was missing samplernames
This commit is contained in:
LuisAntonRebollo 2014-11-30 04:59:24 +01:00
commit 32e8725931
2 changed files with 6 additions and 4 deletions

View file

@ -532,8 +532,9 @@ void DeferredMinnaertGLSL::setTexData( Material::StageData &stageDat,
NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName);
if ( texTarget ) if ( texTarget )
{ {
passData.mTexType[ texIndex ] = Material::TexTarget; passData.mTexType[texIndex] = Material::TexTarget;
passData.mTexSlot[ texIndex++ ].texTarget = texTarget; passData.mSamplerNames[texIndex] = "prepassBuffer";
passData.mTexSlot[ texIndex++ ].texTarget = texTarget;
} }
} }
} }

View file

@ -532,8 +532,9 @@ void DeferredMinnaertHLSL::setTexData( Material::StageData &stageDat,
NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName);
if ( texTarget ) if ( texTarget )
{ {
passData.mTexType[ texIndex ] = Material::TexTarget; passData.mTexType[texIndex] = Material::TexTarget;
passData.mTexSlot[ texIndex++ ].texTarget = texTarget; passData.mSamplerNames[texIndex] = "prepassBuffer";
passData.mTexSlot[ texIndex++ ].texTarget = texTarget;
} }
} }
} }