diff options
Diffstat (limited to 'indra/llrender/llglstates.h')
| -rw-r--r-- | indra/llrender/llglstates.h | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/indra/llrender/llglstates.h b/indra/llrender/llglstates.h index a4924eba14..c46585eab4 100644 --- a/indra/llrender/llglstates.h +++ b/indra/llrender/llglstates.h @@ -57,7 +57,7 @@ class LLGLSDefault { protected: LLGLEnable mColorMaterial; - LLGLDisable mAlphaTest, mBlend, mCullFace, mDither, mFog, + LLGLDisable mAlphaTest, mBlend, mCullFace, mDither, mLineSmooth, mLineStipple, mNormalize, mPolygonSmooth, mGLMultisample; public: @@ -70,23 +70,22 @@ public: mBlend(GL_BLEND), mCullFace(GL_CULL_FACE), mDither(GL_DITHER), - mFog(GL_FOG), mLineSmooth(GL_LINE_SMOOTH), mLineStipple(GL_LINE_STIPPLE), mNormalize(GL_NORMALIZE), mPolygonSmooth(GL_POLYGON_SMOOTH), - mGLMultisample(GL_MULTISAMPLE_ARB) + mGLMultisample(GL_MULTISAMPLE) { } }; class LLGLSObjectSelect { protected: - LLGLDisable mBlend, mFog, mAlphaTest; + LLGLDisable mBlend, mAlphaTest; LLGLEnable mCullFace; public: LLGLSObjectSelect() - : mBlend(GL_BLEND), mFog(GL_FOG), + : mBlend(GL_BLEND), mAlphaTest(GL_ALPHA_TEST), mCullFace(GL_CULL_FACE) { } @@ -130,28 +129,6 @@ public: //---------------------------------------------------------------------------- -class LLGLSFog -{ -protected: - LLGLEnable mFog; -public: - LLGLSFog() - : mFog(GL_FOG) - {} -}; - -class LLGLSNoFog -{ -protected: - LLGLDisable mFog; -public: - LLGLSNoFog() - : mFog(GL_FOG) - {} -}; - -//---------------------------------------------------------------------------- - class LLGLSPipeline { protected: @@ -175,16 +152,6 @@ public: { } }; -class LLGLSPipelineEmbossBump -{ -protected: - LLGLDisable mFog; -public: - LLGLSPipelineEmbossBump() - : mFog(GL_FOG) - { } -}; - class LLGLSPipelineSelection { protected: |