mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 16:14:38 +00:00
* [OpenGL] BugFix: Correct shader errors being thrown during the load phase due to direct use of glUseProgram causing desync with GFXGLDevice.
This commit is contained in:
parent
328319b853
commit
c8a5ccb191
3 changed files with 10 additions and 6 deletions
|
|
@ -32,14 +32,15 @@
|
|||
class GFXGLShaderConstHandle;
|
||||
class FileStream;
|
||||
class GFXGLShaderConstBuffer;
|
||||
class GFXGLDevice;
|
||||
|
||||
class GFXGLShader : public GFXShader
|
||||
{
|
||||
typedef Map<String, GFXGLShaderConstHandle*> HandleMap;
|
||||
public:
|
||||
GFXGLShader();
|
||||
GFXGLShader(GFXGLDevice* device);
|
||||
virtual ~GFXGLShader();
|
||||
|
||||
|
||||
/// @name GFXShader interface
|
||||
/// @{
|
||||
virtual GFXShaderConstHandle* getShaderConstHandle(const String& name);
|
||||
|
|
@ -99,6 +100,7 @@ protected:
|
|||
U32 mConstBufferSize;
|
||||
U8* mConstBuffer;
|
||||
HandleMap mHandles;
|
||||
GFXGLDevice* mDevice;
|
||||
Vector<GFXGLShaderConstHandle*> mValidHandles;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue