diff options
author | Jacek Antonelli | 2008-08-15 23:45:44 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:44 -0500 |
commit | acfdcf2b1deeb04698174c78e8cb22b093445bb1 (patch) | |
tree | 811293650bcf81d01ea7c54d7c2cf263110aa329 /linden/indra/newview/lldrawpoolwlsky.cpp | |
parent | Second Life viewer sources 1.20.2 (diff) | |
download | meta-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/lldrawpoolwlsky.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpoolwlsky.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp index d18f0de..e10cd0a 100644 --- a/linden/indra/newview/lldrawpoolwlsky.cpp +++ b/linden/indra/newview/lldrawpoolwlsky.cpp | |||
@@ -159,9 +159,7 @@ void LLDrawPoolWLSky::renderStars(void) const | |||
159 | // combiners blending below requires something to be bound | 159 | // combiners blending below requires something to be bound |
160 | // and we might as well only bind once. | 160 | // and we might as well only bind once. |
161 | //LLGLEnable gl_texture_2d(GL_TEXTURE_2D); | 161 | //LLGLEnable gl_texture_2d(GL_TEXTURE_2D); |
162 | glDisableClientState(GL_TEXTURE_COORD_ARRAY); | 162 | |
163 | glDisableClientState(GL_NORMAL_ARRAY); | ||
164 | |||
165 | gPipeline.disableLights(); | 163 | gPipeline.disableLights(); |
166 | 164 | ||
167 | if (!LLPipeline::sReflectionRender) | 165 | if (!LLPipeline::sReflectionRender) |
@@ -224,9 +222,6 @@ void LLDrawPoolWLSky::renderSkyClouds(F32 camHeightLocal) const | |||
224 | 222 | ||
225 | void LLDrawPoolWLSky::renderHeavenlyBodies() | 223 | void LLDrawPoolWLSky::renderHeavenlyBodies() |
226 | { | 224 | { |
227 | glEnableClientState(GL_VERTEX_ARRAY); | ||
228 | glEnableClientState(GL_TEXTURE_COORD_ARRAY); | ||
229 | glDisableClientState(GL_NORMAL_ARRAY); | ||
230 | LLGLSPipelineSkyBox gls_skybox; | 225 | LLGLSPipelineSkyBox gls_skybox; |
231 | LLGLEnable blend_on(GL_BLEND); | 226 | LLGLEnable blend_on(GL_BLEND); |
232 | gPipeline.disableLights(); | 227 | gPipeline.disableLights(); |
@@ -240,7 +235,6 @@ void LLDrawPoolWLSky::renderHeavenlyBodies() | |||
240 | LLColor4 color(gSky.mVOSkyp->getSun().getInterpColor()); | 235 | LLColor4 color(gSky.mVOSkyp->getSun().getInterpColor()); |
241 | LLFacePool::LLOverrideFaceColor color_override(this, color); | 236 | LLFacePool::LLOverrideFaceColor color_override(this, color); |
242 | face->renderIndexed(); | 237 | face->renderIndexed(); |
243 | mIndicesDrawn += face->getIndicesCount(); | ||
244 | } | 238 | } |
245 | #endif | 239 | #endif |
246 | 240 | ||
@@ -264,10 +258,7 @@ void LLDrawPoolWLSky::renderHeavenlyBodies() | |||
264 | 258 | ||
265 | LLFacePool::LLOverrideFaceColor color_override(this, color); | 259 | LLFacePool::LLOverrideFaceColor color_override(this, color); |
266 | face->renderIndexed(); | 260 | face->renderIndexed(); |
267 | mIndicesDrawn += face->getIndicesCount(); | ||
268 | } | 261 | } |
269 | |||
270 | glDisableClientState(GL_TEXTURE_COORD_ARRAY); | ||
271 | } | 262 | } |
272 | 263 | ||
273 | void LLDrawPoolWLSky::render(S32 pass) | 264 | void LLDrawPoolWLSky::render(S32 pass) |