aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpoolsky.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lldrawpoolsky.cpp')
-rw-r--r--linden/indra/newview/lldrawpoolsky.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/linden/indra/newview/lldrawpoolsky.cpp b/linden/indra/newview/lldrawpoolsky.cpp
index ac5c389..e06bb6d 100644
--- a/linden/indra/newview/lldrawpoolsky.cpp
+++ b/linden/indra/newview/lldrawpoolsky.cpp
@@ -113,10 +113,6 @@ void LLDrawPoolSky::render(S32 pass)
113 LLVector3 origin = LLViewerCamera::getInstance()->getOrigin(); 113 LLVector3 origin = LLViewerCamera::getInstance()->getOrigin();
114 glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]); 114 glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
115 115
116 glEnableClientState(GL_VERTEX_ARRAY);
117 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
118 glDisableClientState(GL_NORMAL_ARRAY);
119
120 S32 face_count = (S32)mDrawFace.size(); 116 S32 face_count = (S32)mDrawFace.size();
121 117
122 for (S32 i = 0; i < llmin(6, face_count); ++i) 118 for (S32 i = 0; i < llmin(6, face_count); ++i)
@@ -160,8 +156,6 @@ void LLDrawPoolSky::render(S32 pass)
160 // renderHeavenlyBody(1, hbfaces[1]); 156 // renderHeavenlyBody(1, hbfaces[1]);
161 } 157 }
162 158
163 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
164
165 glPopMatrix(); 159 glPopMatrix();
166} 160}
167 161
@@ -184,8 +178,6 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side)
184 glColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled 178 glColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled
185 face.renderIndexed(); 179 face.renderIndexed();
186 } 180 }
187
188 mIndicesDrawn += face.getIndicesCount();
189} 181}
190 182
191void LLDrawPoolSky::renderHeavenlyBody(U8 hb, LLFace* face) 183void LLDrawPoolSky::renderHeavenlyBody(U8 hb, LLFace* face)
@@ -198,7 +190,6 @@ void LLDrawPoolSky::renderHeavenlyBody(U8 hb, LLFace* face)
198 LLColor4 color(mHB[hb]->getInterpColor()); 190 LLColor4 color(mHB[hb]->getInterpColor());
199 LLOverrideFaceColor override(this, color); 191 LLOverrideFaceColor override(this, color);
200 face->renderIndexed(); 192 face->renderIndexed();
201 mIndicesDrawn += face->getIndicesCount();
202} 193}
203 194
204 195
@@ -215,7 +206,6 @@ void LLDrawPoolSky::renderSunHalo(LLFace* face)
215 206
216 LLOverrideFaceColor override(this, color); 207 LLOverrideFaceColor override(this, color);
217 face->renderIndexed(); 208 face->renderIndexed();
218 mIndicesDrawn += face->getIndicesCount();
219} 209}
220 210
221 211