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/llpostprocess.h | |
parent | cb902bf9a97177322c222a032715262987c98eb9 (diff) | |
parent | 765a99d238da80bcf705f58f8e8d6082050c0260 (diff) |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llrender/llpostprocess.h')
-rw-r--r-- | indra/llrender/llpostprocess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h index ce17b6693d..bdfc632831 100644 --- a/indra/llrender/llpostprocess.h +++ b/indra/llrender/llpostprocess.h @@ -249,12 +249,12 @@ private: void applyColorFilterShader(void); /// OpenGL Helper Functions - void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog); + void getShaderUniforms(glslUniforms & uniforms, GLuint & prog); void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height); void copyFrameBuffer(U32 & texture, unsigned int width, unsigned int height); void createNoiseTexture(LLPointer<LLImageGL>& texture); bool checkError(void); - void checkShaderError(GLhandleARB shader); + void checkShaderError(GLuint shader); void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type); void viewOrthogonal(unsigned int width, unsigned int height); void changeOrthogonal(unsigned int width, unsigned int height); |