aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-28 20:04:52 -0600
committerJacek Antonelli2009-01-28 20:05:02 -0600
commit0ef11cf31364456ec247b0fc7ad8f6d1de408400 (patch)
tree50754b286468147a70271253a2a74215c80e1354 /linden/indra/llrender
parentSecond Life viewer sources 1.22.5-RC (diff)
downloadmeta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.zip
meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.gz
meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.bz2
meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.xz
Second Life viewer sources 1.22.6-RC
Diffstat (limited to 'linden/indra/llrender')
-rw-r--r--linden/indra/llrender/llimagegl.cpp12
-rw-r--r--linden/indra/llrender/llimagegl.h2
2 files changed, 0 insertions, 14 deletions
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 8195eee..6a142a7 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -61,8 +61,6 @@ S32 LLImageGL::sCount = 0;
61BOOL LLImageGL::sGlobalUseAnisotropic = FALSE; 61BOOL LLImageGL::sGlobalUseAnisotropic = FALSE;
62F32 LLImageGL::sLastFrameTime = 0.f; 62F32 LLImageGL::sLastFrameTime = 0.f;
63 63
64S32 LLImageGL::sMaxTextureSize = 0 ;
65
66std::set<LLImageGL*> LLImageGL::sImageList; 64std::set<LLImageGL*> LLImageGL::sImageList;
67 65
68//************************************************************************************** 66//**************************************************************************************
@@ -378,16 +376,6 @@ void LLImageGL::setSize(S32 width, S32 height, S32 ncomponents)
378{ 376{
379 if (width != mWidth || height != mHeight || ncomponents != mComponents) 377 if (width != mWidth || height != mHeight || ncomponents != mComponents)
380 { 378 {
381 if(width > 1024 || height > 1024)
382 {
383 llwarns << "texture size is big: width: " << width << " height: " << height << llendl ;
384 if(!sMaxTextureSize)
385 {
386 glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*)&sMaxTextureSize) ;
387 }
388 llwarns << "max texture size is: " << sMaxTextureSize << llendl ;
389 }
390
391 // Check if dimensions are a power of two! 379 // Check if dimensions are a power of two!
392 if (!checkSize(width,height)) 380 if (!checkSize(width,height))
393 { 381 {
diff --git a/linden/indra/llrender/llimagegl.h b/linden/indra/llrender/llimagegl.h
index e8c0a4a..1965495 100644
--- a/linden/indra/llrender/llimagegl.h
+++ b/linden/indra/llrender/llimagegl.h
@@ -212,8 +212,6 @@ public:
212 static U32 sBindCount; // Tracks number of texture binds for current frame 212 static U32 sBindCount; // Tracks number of texture binds for current frame
213 static U32 sUniqueCount; // Tracks number of unique texture binds for current frame 213 static U32 sUniqueCount; // Tracks number of unique texture binds for current frame
214 static BOOL sGlobalUseAnisotropic; 214 static BOOL sGlobalUseAnisotropic;
215
216 static S32 sMaxTextureSize ;
217#if DEBUG_MISS 215#if DEBUG_MISS
218 BOOL mMissed; // Missed on last bind? 216 BOOL mMissed; // Missed on last bind?
219 BOOL getMissed() const { return mMissed; }; 217 BOOL getMissed() const { return mMissed; };