Ported many texture engine changes from Snowglobe.

1 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index a269225..9c383c7 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -234,7 +234,7 @@ BOOL LLVLComposition::generateComposition()
         {
                 if (mDetailTextures[i]->getDiscardLevel() < 0)
                 {
-                        mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_TERRAIN); // in case we are at low detail
+                        mDetailTextures[i]->setBoostLevel(LLViewerImageBoostLevel::BOOST_TERRAIN); // in case we are at low detail
                         mDetailTextures[i]->addTextureStats(BASE_SIZE*BASE_SIZE);
                         return FALSE;
                 }
@@ -251,7 +251,7 @@ BOOL LLVLComposition::generateComposition()
                                 ddiscard++;
                                 min_dim /= 2;
                         }
-                        mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_TERRAIN); // in case we are at low detail
+                        mDetailTextures[i]->setBoostLevel(LLViewerImageBoostLevel::BOOST_TERRAIN); // in case we are at low detail
                         mDetailTextures[i]->setMinDiscardLevel(ddiscard);
                         return FALSE;
                 }
@@ -292,10 +292,10 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
                                 ddiscard++;
                                 min_dim /= 2;
                         }
-                        if (!mDetailTextures[i]->readBackRaw(ddiscard, mRawImages[i], false))
+                        mRawImages[i] = mDetailTextures[i]->getCachedRawImage() ;
+                        if (!mRawImages[i])
                         {
-                                llwarns << "Unable to read raw data for terrain detail texture: " << mDetailTextures[i]->getID() << llendl;
-                                mRawImages[i] = NULL;
+                                llwarns << "no cached raw data for terrain detail texture: " << mDetailTextures[i]->getID() << llendl;
                                 return FALSE;
                         }
                         if (mDetailTextures[i]->getWidth(ddiscard) != BASE_SIZE ||
@@ -460,7 +460,7 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
         for (S32 i = 0; i < 4; i++)
         {
                 // Un-boost detatil textures (will get re-boosted if rendering in high detail)
-                mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_NONE);
+                mDetailTextures[i]->setBoostLevel(LLViewerImageBoostLevel::BOOST_NONE);
                 mDetailTextures[i]->setMinDiscardLevel(MAX_DISCARD_LEVEL + 1);
         }