From b5f8e9aa707d9b61604868532b1059ef80bbd007 Mon Sep 17 00:00:00 2001 From: rextimmy Date: Sun, 14 Jun 2015 15:59:33 +1000 Subject: [PATCH] gfxGLDevice setShader fix. --- Engine/source/gfx/gl/gfxGLDevice.cpp | 4 ++-- Engine/source/gfx/gl/gfxGLDevice.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/gfx/gl/gfxGLDevice.cpp b/Engine/source/gfx/gl/gfxGLDevice.cpp index 5f690a14d..9cec609d1 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.cpp +++ b/Engine/source/gfx/gl/gfxGLDevice.cpp @@ -811,9 +811,9 @@ GFXShader* GFXGLDevice::createShader() return shader; } -void GFXGLDevice::setShader( GFXShader *shader ) +void GFXGLDevice::setShader(GFXShader *shader, bool force) { - if(mCurrentShader == shader) + if(mCurrentShader == shader && !force) return; if ( shader ) diff --git a/Engine/source/gfx/gl/gfxGLDevice.h b/Engine/source/gfx/gl/gfxGLDevice.h index c7f167647..72193835d 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.h +++ b/Engine/source/gfx/gl/gfxGLDevice.h @@ -90,7 +90,7 @@ public: virtual F32 getPixelShaderVersion() const { return mPixelShaderVersion; } 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! virtual GFXFormat selectSupportedFormat(GFXTextureProfile *profile,