aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llglstates.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender/llglstates.h')
-rw-r--r--linden/indra/llrender/llglstates.h24
1 files changed, 3 insertions, 21 deletions
diff --git a/linden/indra/llrender/llglstates.h b/linden/indra/llrender/llglstates.h
index e53640c..94d136e 100644
--- a/linden/indra/llrender/llglstates.h
+++ b/linden/indra/llrender/llglstates.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$ 5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2001-2008, Linden Research, Inc. 7 * Copyright (c) 2001-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -87,13 +87,6 @@ public:
87 { } 87 { }
88}; 88};
89 89
90class LLGLSNoTexture
91{
92public:
93 LLGLSNoTexture()
94 { LLImageGL::unbindTexture(0); }
95};
96
97class LLGLSObjectSelect 90class LLGLSObjectSelect
98{ 91{
99protected: 92protected:
@@ -104,7 +97,7 @@ public:
104 : mBlend(GL_BLEND), mFog(GL_FOG), 97 : mBlend(GL_BLEND), mFog(GL_FOG),
105 mAlphaTest(GL_ALPHA_TEST), 98 mAlphaTest(GL_ALPHA_TEST),
106 mCullFace(GL_CULL_FACE) 99 mCullFace(GL_CULL_FACE)
107 { LLImageGL::unbindTexture(0); } 100 { }
108}; 101};
109 102
110class LLGLSObjectSelectAlpha 103class LLGLSObjectSelectAlpha
@@ -143,17 +136,6 @@ public:
143 {} 136 {}
144}; 137};
145 138
146class LLGLSNoTextureNoAlphaTest // : public LLGLSUIDefault
147{
148protected:
149 LLGLDisable mAlphaTest;
150public:
151 LLGLSNoTextureNoAlphaTest()
152 : mAlphaTest(GL_ALPHA_TEST)
153
154 { LLImageGL::unbindTexture(0); }
155};
156
157//---------------------------------------------------------------------------- 139//----------------------------------------------------------------------------
158 140
159class LLGLSFog 141class LLGLSFog
@@ -251,7 +233,7 @@ public:
251 mBlend(GL_BLEND), 233 mBlend(GL_BLEND),
252 mAlphaTest(GL_ALPHA_TEST) 234 mAlphaTest(GL_ALPHA_TEST)
253 235
254 { LLImageGL::unbindTexture(0); } 236 { }
255}; 237};
256 238
257//---------------------------------------------------------------------------- 239//----------------------------------------------------------------------------