TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add RenderPassData::mSamplerNames for OpenGL code. Not used on DX9.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-04-17 17:36:29 +02:00
parent 2142d452d4
commit ba36617aec
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/materials/processedMaterial.cpp
View file

@ -41,7 +41,10 @@ RenderPassData::RenderPassData()
void RenderPassData::reset() void RenderPassData::reset()
{ {
for( U32 i = 0; i < Material::MAX_TEX_PER_PASS; ++ i ) for( U32 i = 0; i < Material::MAX_TEX_PER_PASS; ++ i )
{
destructInPlace( &mTexSlot[ i ] ); destructInPlace( &mTexSlot[ i ] );
mSamplerNames[ i ].clear();
}
dMemset( &mTexSlot, 0, sizeof(mTexSlot) ); dMemset( &mTexSlot, 0, sizeof(mTexSlot) );
dMemset( &mTexType, 0, sizeof(mTexType) ); dMemset( &mTexType, 0, sizeof(mTexType) );

1
Engine/source/materials/processedMaterial.h
View file

@ -68,6 +68,7 @@ public:
} mTexSlot[Material::MAX_TEX_PER_PASS]; } mTexSlot[Material::MAX_TEX_PER_PASS];
U32 mTexType[Material::MAX_TEX_PER_PASS]; U32 mTexType[Material::MAX_TEX_PER_PASS];
String mSamplerNames[Material::MAX_TEX_PER_PASS];
/// The cubemap to use when the texture type is /// The cubemap to use when the texture type is
/// set to Material::Cube. /// set to Material::Cube.