aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpoolsimple.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:44 -0500
committerJacek Antonelli2008-08-15 23:45:44 -0500
commitacfdcf2b1deeb04698174c78e8cb22b093445bb1 (patch)
tree811293650bcf81d01ea7c54d7c2cf263110aa329 /linden/indra/newview/lldrawpoolsimple.cpp
parentSecond Life viewer sources 1.20.2 (diff)
downloadmeta-impy-acfdcf2b1deeb04698174c78e8cb22b093445bb1.zip
meta-impy-acfdcf2b1deeb04698174c78e8cb22b093445bb1.tar.gz
meta-impy-acfdcf2b1deeb04698174c78e8cb22b093445bb1.tar.bz2
meta-impy-acfdcf2b1deeb04698174c78e8cb22b093445bb1.tar.xz
Second Life viewer sources 1.20.3
Diffstat (limited to 'linden/indra/newview/lldrawpoolsimple.cpp')
-rw-r--r--linden/indra/newview/lldrawpoolsimple.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/linden/indra/newview/lldrawpoolsimple.cpp b/linden/indra/newview/lldrawpoolsimple.cpp
index cdb22bf..330ac57 100644
--- a/linden/indra/newview/lldrawpoolsimple.cpp
+++ b/linden/indra/newview/lldrawpoolsimple.cpp
@@ -65,13 +65,10 @@ void LLDrawPoolGlow::render(S32 pass)
65 gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); 65 gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
66 } 66 }
67 67
68 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
69 LLGLDepthTest depth(GL_TRUE, GL_FALSE); 68 LLGLDepthTest depth(GL_TRUE, GL_FALSE);
70 glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE); 69 glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
71 renderTexture(LLRenderPass::PASS_GLOW, getVertexDataMask()); 70 renderTexture(LLRenderPass::PASS_GLOW, getVertexDataMask());
72 71
73 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
74
75 glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); 72 glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
76 gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 73 gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
77 74
@@ -101,10 +98,6 @@ void LLDrawPoolSimple::prerender()
101void LLDrawPoolSimple::beginRenderPass(S32 pass) 98void LLDrawPoolSimple::beginRenderPass(S32 pass)
102{ 99{
103 LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE); 100 LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
104 glEnableClientState(GL_VERTEX_ARRAY);
105 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
106 glEnableClientState(GL_NORMAL_ARRAY);
107 glEnableClientState(GL_COLOR_ARRAY);
108 101
109 if (LLPipeline::sUnderWaterRender) 102 if (LLPipeline::sUnderWaterRender)
110 { 103 {
@@ -136,7 +129,6 @@ void LLDrawPoolSimple::endRenderPass(S32 pass)
136{ 129{
137 LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE); 130 LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
138 LLRenderPass::endRenderPass(pass); 131 LLRenderPass::endRenderPass(pass);
139 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
140 132
141 if (mVertexShaderLevel > 0){ 133 if (mVertexShaderLevel > 0){
142 134
@@ -177,7 +169,6 @@ void LLDrawPoolSimple::render(S32 pass)
177 } 169 }
178 LLFastTimer t(LLFastTimer::FTM_RENDER_FULLBRIGHT); 170 LLFastTimer t(LLFastTimer::FTM_RENDER_FULLBRIGHT);
179 U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_COLOR; 171 U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_COLOR;
180 glDisableClientState(GL_NORMAL_ARRAY);
181 renderTexture(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask); 172 renderTexture(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask);
182 } 173 }
183 174