diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-09-09 15:35:32 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-09-09 15:35:32 -0700 |
| commit | e488c87532ad9e8cc0e6d34ecf647fe719f2ba6a (patch) | |
| tree | 68d3adaf448b9f895675a981ca833d4aa8e771ad /indra/llrender/llglslshader.h | |
| parent | cb902bf9a97177322c222a032715262987c98eb9 (diff) | |
| parent | 765a99d238da80bcf705f58f8e8d6082050c0260 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 68e1a8954d..c26ee014cb 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -146,7 +146,7 @@ public: LLGLSLShader(); ~LLGLSLShader(); - static GLhandleARB sCurBoundShader; + static GLuint sCurBoundShader; static LLGLSLShader* sCurBoundShaderPtr; static S32 sIndexedTextureChannels; @@ -168,8 +168,8 @@ public: const char** varyings = NULL); BOOL attachFragmentObject(std::string object); BOOL attachVertexObject(std::string object); - void attachObject(GLhandleARB object); - void attachObjects(GLhandleARB* objects = NULL, S32 count = 0); + void attachObject(GLuint object); + void attachObjects(GLuint* objects = NULL, S32 count = 0); BOOL mapAttributes(const std::vector<LLStaticHashedString> * attributes); BOOL mapUniforms(const std::vector<LLStaticHashedString> *); void mapUniform(GLint index, const std::vector<LLStaticHashedString> *); @@ -243,7 +243,7 @@ public: U32 mMatHash[LLRender::NUM_MATRIX_MODES]; U32 mLightHash; - GLhandleARB mProgramObject; + GLuint mProgramObject; #if LL_RELEASE_WITH_DEBUG_INFO struct attr_name { |