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

Remove GFXDevice::disableShader becouse we are going to remove Fixed Function Pipeline and we need a shader for render.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-11-30 02:36:21 +01:00
parent c354f59b72
commit 0747a0efe9
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/D3D9/gfxD3D9Device.h
View file

@ -238,6 +238,7 @@ protected:
// } // }
virtual GFXShader* createShader(); virtual GFXShader* createShader();
void disableShaders();
/// Device helper function /// Device helper function
virtual D3DPRESENT_PARAMETERS setupPresentParams( const GFXVideoMode &mode, const HWND &hwnd ) const = 0; virtual D3DPRESENT_PARAMETERS setupPresentParams( const GFXVideoMode &mode, const HWND &hwnd ) const = 0;
@ -271,7 +272,6 @@ public:
virtual F32 getPixelShaderVersion() const { return mPixVersion; } virtual F32 getPixelShaderVersion() const { return mPixVersion; }
virtual void setPixelShaderVersion( F32 version ){ mPixVersion = version; } virtual void setPixelShaderVersion( F32 version ){ mPixVersion = version; }
virtual void disableShaders();
virtual void setShader( GFXShader *shader ); virtual void setShader( GFXShader *shader );
virtual U32 getNumSamplers() const { return mNumSamplers; } virtual U32 getNumSamplers() const { return mNumSamplers; }
virtual U32 getNumRenderTargets() const { return mNumRenderTargets; } virtual U32 getNumRenderTargets() const { return mNumRenderTargets; }

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

@ -90,7 +90,6 @@ public:
virtual void setPixelShaderVersion( F32 version ) { mPixelShaderVersion = version; } virtual void setPixelShaderVersion( F32 version ) { mPixelShaderVersion = version; }
virtual void setShader(GFXShader* shd); virtual void setShader(GFXShader* shd);
virtual void disableShaders(); ///< Equivalent to setShader(NULL)
/// @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,