diff options
author | David Seikel | 2011-04-26 21:30:21 +1000 |
---|---|---|
committer | David Seikel | 2011-04-26 21:30:21 +1000 |
commit | da97e24c3b045d16589124496d032ffb9b4ca07f (patch) | |
tree | 34d84cf4355f83e1a106d06a10ed2a4bb121fdc4 /linden/indra/llrender | |
parent | Apparently there is a wrong client tag for firestorm out in the wild. (diff) | |
parent | Changed version to Experimental 2011.04.19 (diff) | |
download | meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.zip meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.gz meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.bz2 meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.xz |
Merge remote-tracking branch 'imprudence/exp' into exp
Conflicts (for future reference):
linden/indra/llcommon/llstring.cpp
linden/indra/newview/llpanelnetwork.cpp
linden/indra/newview/llselectmgr.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/lltoolmgr.cpp
linden/indra/newview/llvoavatar.cpp
Diffstat (limited to 'linden/indra/llrender')
-rw-r--r-- | linden/indra/llrender/llimagegl.cpp | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp index 7cd4dd7..c63d7ad 100644 --- a/linden/indra/llrender/llimagegl.cpp +++ b/linden/indra/llrender/llimagegl.cpp | |||
@@ -375,45 +375,54 @@ LLImageGL::~LLImageGL() | |||
375 | 375 | ||
376 | void LLImageGL::init(BOOL usemipmaps) | 376 | void LLImageGL::init(BOOL usemipmaps) |
377 | { | 377 | { |
378 | #ifdef DEBUG_MISS | 378 | // keep these members in the same order as declared in llimagehl.h |
379 | mMissed = FALSE; | 379 | // so that it is obvious by visual inspection if we forgot to |
380 | #endif | 380 | // init a field. |
381 | 381 | ||
382 | mPickMask = NULL; | 382 | mTextureMemory = 0; |
383 | mPickMaskSize = 0; | 383 | mLastBindTime = 0.f; |
384 | mTextureState = NO_DELETE ; | 384 | |
385 | mTextureMemory = 0; | 385 | mPickMask = NULL; |
386 | mLastBindTime = 0.f; | 386 | mPickMaskSize = 0; |
387 | mUseMipMaps = usemipmaps; | ||
388 | mHasExplicitFormat = FALSE; | ||
389 | mAutoGenMips = FALSE; | ||
390 | |||
391 | mIsMask = FALSE; | ||
392 | |||
393 | mGLTextureCreated = false; | ||
394 | mTexName = 0; | ||
395 | mWidth = 0; | ||
396 | mHeight = 0; | ||
397 | mCurrentDiscardLevel = -1; | ||
387 | 398 | ||
388 | mTarget = GL_TEXTURE_2D; | 399 | mTarget = GL_TEXTURE_2D; |
389 | mBindTarget = LLTexUnit::TT_TEXTURE; | 400 | mBindTarget = LLTexUnit::TT_TEXTURE; |
390 | mUseMipMaps = usemipmaps; | ||
391 | mHasMipMaps = false; | 401 | mHasMipMaps = false; |
392 | mAutoGenMips = FALSE; | 402 | |
393 | mTexName = 0; | 403 | mIsResident = 0; |
394 | mIsResident = 0; | 404 | |
405 | mComponents = 0; | ||
406 | mMaxDiscardLevel = MAX_DISCARD_LEVEL; | ||
395 | 407 | ||
396 | mTexOptionsDirty = true; | 408 | mTexOptionsDirty = true; |
397 | mAddressMode = LLTexUnit::TAM_WRAP; | 409 | mAddressMode = LLTexUnit::TAM_WRAP; |
398 | mFilterOption = LLTexUnit::TFO_ANISOTROPIC; | 410 | mFilterOption = LLTexUnit::TFO_ANISOTROPIC; |
399 | mWidth = 0; | ||
400 | mHeight = 0; | ||
401 | mComponents = 0; | ||
402 | |||
403 | mMaxDiscardLevel = MAX_DISCARD_LEVEL; | ||
404 | mCurrentDiscardLevel = -1; | ||
405 | mDontDiscard = FALSE; | ||
406 | 411 | ||
407 | mFormatInternal = -1; | 412 | mFormatInternal = -1; |
408 | mFormatPrimary = (LLGLenum) 0; | 413 | mFormatPrimary = (LLGLenum) 0; |
409 | mFormatType = GL_UNSIGNED_BYTE; | 414 | mFormatType = GL_UNSIGNED_BYTE; |
410 | mFormatSwapBytes = FALSE; | 415 | mFormatSwapBytes = FALSE; |
411 | mHasExplicitFormat = FALSE; | ||
412 | 416 | ||
413 | mGLTextureCreated = FALSE ; | 417 | #ifdef DEBUG_MISS |
418 | mMissed = FALSE; | ||
419 | #endif | ||
414 | 420 | ||
415 | mIsMask = FALSE; | ||
416 | mCategory = -1 ; | 421 | mCategory = -1 ; |
422 | |||
423 | //LLTexture stuff | ||
424 | mDontDiscard = FALSE; | ||
425 | mTextureState = NO_DELETE ; | ||
417 | } | 426 | } |
418 | 427 | ||
419 | void LLImageGL::cleanup() | 428 | void LLImageGL::cleanup() |