diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llrender/llimagegl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp index cdf626e..d1efb11 100644 --- a/linden/indra/llrender/llimagegl.cpp +++ b/linden/indra/llrender/llimagegl.cpp | |||
@@ -54,8 +54,8 @@ LLGLuint LLImageGL::sCurrentBoundTextures[MAX_GL_TEXTURE_UNITS] = { 0 }; | |||
54 | 54 | ||
55 | U32 LLImageGL::sUniqueCount = 0; | 55 | U32 LLImageGL::sUniqueCount = 0; |
56 | U32 LLImageGL::sBindCount = 0; | 56 | U32 LLImageGL::sBindCount = 0; |
57 | S32 LLImageGL::sGlobalTextureMemory = 0; | 57 | S32 LLImageGL::sGlobalTextureMemoryInBytes = 0; |
58 | S32 LLImageGL::sBoundTextureMemory = 0; | 58 | S32 LLImageGL::sBoundTextureMemoryInBytes = 0; |
59 | S32 LLImageGL::sCurBoundTextureMemory = 0; | 59 | S32 LLImageGL::sCurBoundTextureMemory = 0; |
60 | S32 LLImageGL::sCount = 0; | 60 | S32 LLImageGL::sCount = 0; |
61 | 61 | ||
@@ -174,7 +174,7 @@ S32 LLImageGL::dataFormatComponents(S32 dataformat) | |||
174 | void LLImageGL::updateStats(F32 current_time) | 174 | void LLImageGL::updateStats(F32 current_time) |
175 | { | 175 | { |
176 | sLastFrameTime = current_time; | 176 | sLastFrameTime = current_time; |
177 | sBoundTextureMemory = sCurBoundTextureMemory; | 177 | sBoundTextureMemoryInBytes = sCurBoundTextureMemory; |
178 | sCurBoundTextureMemory = 0; | 178 | sCurBoundTextureMemory = 0; |
179 | } | 179 | } |
180 | 180 | ||
@@ -1013,13 +1013,13 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_ | |||
1013 | 1013 | ||
1014 | if (old_name != 0) | 1014 | if (old_name != 0) |
1015 | { | 1015 | { |
1016 | sGlobalTextureMemory -= mTextureMemory; | 1016 | sGlobalTextureMemoryInBytes -= mTextureMemory; |
1017 | LLImageGL::deleteTextures(1, &old_name); | 1017 | LLImageGL::deleteTextures(1, &old_name); |
1018 | stop_glerror(); | 1018 | stop_glerror(); |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | mTextureMemory = getMipBytes(discard_level); | 1021 | mTextureMemory = getMipBytes(discard_level); |
1022 | sGlobalTextureMemory += mTextureMemory; | 1022 | sGlobalTextureMemoryInBytes += mTextureMemory; |
1023 | setActive() ; | 1023 | setActive() ; |
1024 | 1024 | ||
1025 | // mark this as bound at this point, so we don't throw it out immediately | 1025 | // mark this as bound at this point, so we don't throw it out immediately |
@@ -1220,7 +1220,7 @@ void LLImageGL::destroyGLTexture() | |||
1220 | } | 1220 | } |
1221 | } | 1221 | } |
1222 | 1222 | ||
1223 | sGlobalTextureMemory -= mTextureMemory; | 1223 | sGlobalTextureMemoryInBytes -= mTextureMemory; |
1224 | mTextureMemory = 0; | 1224 | mTextureMemory = 0; |
1225 | 1225 | ||
1226 | LLImageGL::deleteTextures(1, &mTexName); | 1226 | LLImageGL::deleteTextures(1, &mTexName); |