diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
| commit | 4057afd29161ad9cb69674ee608e48bc9e46a559 (patch) | |
| tree | 058c53cb19d9b3e85fb0f9b70623c563704cdf17 /indra/llrender/llgl.cpp | |
| parent | 0f1dea30f827f920d2323d9450826f1a4baaa10b (diff) | |
| parent | 7c222dfd136a4bb97700b390f8adbef6fe67cf5d (diff) | |
merge changes for storm-1268
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 39f59c0bd8..4e3cfb9c8a 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -48,6 +48,7 @@ #include "llstacktrace.h" #include "llglheaders.h" +#include "llglslshader.h" #ifdef _DEBUG //#define GL_STATE_VERIFY @@ -1781,6 +1782,16 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask) LLGLState::LLGLState(LLGLenum state, S32 enabled) : mState(state), mWasEnabled(FALSE), mIsEnabled(FALSE) { + if (LLGLSLShader::sNoFixedFunction) + { //always disable state that's deprecated post GL 3.0 + switch (state) + { + case GL_ALPHA_TEST: + enabled = 0; + break; + } + } + stop_glerror(); if (state) { |