aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llcubemap.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llcubemap.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llcubemap.cpp')
-rw-r--r--linden/indra/newview/llcubemap.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llcubemap.cpp b/linden/indra/newview/llcubemap.cpp
index baa33ac..e11f058 100644
--- a/linden/indra/newview/llcubemap.cpp
+++ b/linden/indra/newview/llcubemap.cpp
@@ -71,7 +71,7 @@ void LLCubeMap::initGL()
71 llassert(gGLManager.mInited); 71 llassert(gGLManager.mInited);
72 72
73 if (gGLManager.mHasCubeMap 73 if (gGLManager.mHasCubeMap
74 && gFeatureManagerp->isFeatureAvailable("RenderCubeMap")) 74 && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
75 { 75 {
76 mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB; 76 mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
77 mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB; 77 mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
@@ -181,7 +181,7 @@ GLuint LLCubeMap::getGLName()
181void LLCubeMap::bind() 181void LLCubeMap::bind()
182{ 182{
183 if (gGLManager.mHasCubeMap 183 if (gGLManager.mHasCubeMap
184 //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap") 184 //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
185 ) 185 )
186 { 186 {
187 // We assume that if they have cube mapping, they have multitexturing. 187 // We assume that if they have cube mapping, they have multitexturing.
@@ -209,7 +209,7 @@ void LLCubeMap::enableTexture(S32 stage)
209 mTextureStage = stage; 209 mTextureStage = stage;
210 if (gGLManager.mHasCubeMap && 210 if (gGLManager.mHasCubeMap &&
211 stage >= 0 211 stage >= 0
212 //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap") 212 //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
213 ) 213 )
214 { 214 {
215 glActiveTextureARB(GL_TEXTURE0_ARB + stage); // NOTE: leaves texture stage set 215 glActiveTextureARB(GL_TEXTURE0_ARB + stage); // NOTE: leaves texture stage set
@@ -246,7 +246,7 @@ void LLCubeMap::disable(void)
246void LLCubeMap::disableTexture(void) 246void LLCubeMap::disableTexture(void)
247{ 247{
248 if (gGLManager.mHasCubeMap && mTextureStage >= 0 248 if (gGLManager.mHasCubeMap && mTextureStage >= 0
249 //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap") 249 //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
250 ) 250 )
251 { 251 {
252 glActiveTextureARB(GL_TEXTURE0_ARB + mTextureStage); 252 glActiveTextureARB(GL_TEXTURE0_ARB + mTextureStage);