TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gfxGLDevice setShader fix.

Browse source
This commit is contained in:
rextimmy 2015-06-14 15:59:33 +10:00 • committed by Daniel Buckmaster
parent 6218d792f3
commit b5f8e9aa70
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/gl/gfxGLDevice.cpp
View file

@ -811,9 +811,9 @@ GFXShader* GFXGLDevice::createShader()
return shader; return shader;
} }
void GFXGLDevice::setShader( GFXShader *shader ) void GFXGLDevice::setShader(GFXShader *shader, bool force)
{ {
if(mCurrentShader == shader) if(mCurrentShader == shader && !force)
return; return;
if ( shader ) if ( shader )

2
Engine/source/gfx/gl/gfxGLDevice.h
View file

@ -90,7 +90,7 @@ public:
virtual F32 getPixelShaderVersion() const { return mPixelShaderVersion; } virtual F32 getPixelShaderVersion() const { return mPixelShaderVersion; }
virtual void setPixelShaderVersion( F32 version ) { mPixelShaderVersion = version; } virtual void setPixelShaderVersion( F32 version ) { mPixelShaderVersion = version; }
virtual void setShader(GFXShader* shd); virtual void setShader(GFXShader *shader, bool force = false);
/// @attention GL cannot check if the given format supports blending or filtering! /// @attention GL cannot check if the given format supports blending or filtering!
virtual GFXFormat selectSupportedFormat(GFXTextureProfile *profile, virtual GFXFormat selectSupportedFormat(GFXTextureProfile *profile,