diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-29 17:51:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-29 17:51:32 -0500 |
| commit | fedae7c4afec073c95bcb4f61c78e60e3acc633b (patch) | |
| tree | af4db2c358db69373fd770b219f0500feb9486db /indra/llrender/llgl.cpp | |
| parent | a234d2433195cfd719910117d2db3185f54af8e7 (diff) | |
| parent | 8ec39da3468f53af85d0cd4d4d9c54a72d6b8152 (diff) | |
merge
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 8937726209..2f6ef2b663 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) { |