Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'shyotl/V2TextureSystem'

Browse Source
This commit is contained in:
Siana Gearz
2011-04-26 00:28:58 +02:00
parent b6c0436c1b 5954e0d71c
commit 04b3dee767
229 changed files with 8451 additions and 4682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llstartup.cpp
View File

@@ -163,7 +163,7 @@
#include "llviewerdisplay.h"
#include "llviewergenericmessage.h"
#include "llviewergesture.h"
#include "llviewerimagelist.h"
#include "llviewertexturelist.h"
#include "llviewermedia.h"
#include "llviewermenu.h"
#include "llviewermessage.h"
@@ -242,7 +242,7 @@ extern bool gLLWindEnabled;
// local globals
//
LLPointer<LLImageGL> gStartImageGL;
LLPointer<LLViewerTexture> gStartTexture;
static LLHost gAgentSimHost;
static BOOL gSkipOptionalUpdate = FALSE;
@@ -331,7 +331,7 @@ void update_texture_fetch()
LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread
LLAppViewer::getImageDecodeThread()->update(1); // unpauses the image thread
LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread
gImageList.updateImages(0.10f);
gTextureList.updateImages(0.10f);
}
void hooked_process_sound_trigger(LLMessageSystem *msg, void **)
@@ -401,7 +401,7 @@ bool idle_startup()
else
{
// Update images?
gImageList.updateImages(0.01f);
gTextureList.updateImages(0.01f);
}
if ( STATE_FIRST == LLStartUp::getStartupState() )
@@ -1905,7 +1905,7 @@ bool idle_startup()
//
// Initialize classes w/graphics stuff.
//
gImageList.doPrefetchImages();
gTextureList.doPrefetchImages();
LLSurface::initClasses();
LLFace::initClass();
@@ -2164,7 +2164,7 @@ bool idle_startup()
F32 frac = (F32)i / (F32)DECODE_TIME_SEC;
set_startup_status(0.45f + frac*0.1f, LLTrans::getString("LoginDecodingImages"), gAgent.mMOTD);
display_startup();
gImageList.decodeAllImages(1.f);
gTextureList.decodeAllImages(1.f);
}
LLStartUp::setStartupState( STATE_WORLD_WAIT );
@@ -3405,8 +3405,8 @@ void pass_processObjectPropertiesFamily(LLMessageSystem *msg, void**)
void register_viewer_callbacks(LLMessageSystem* msg)
{
msg->setHandlerFuncFast(_PREHASH_LayerData, process_layer_data );
msg->setHandlerFuncFast(_PREHASH_ImageData, LLViewerImageList::receiveImageHeader );
msg->setHandlerFuncFast(_PREHASH_ImagePacket, LLViewerImageList::receiveImagePacket );
msg->setHandlerFuncFast(_PREHASH_ImageData, LLViewerTextureList::receiveImageHeader );
msg->setHandlerFuncFast(_PREHASH_ImagePacket, LLViewerTextureList::receiveImagePacket );
msg->setHandlerFuncFast(_PREHASH_ObjectUpdate, process_object_update );
msg->setHandlerFunc("ObjectUpdateCompressed", process_compressed_object_update );
msg->setHandlerFunc("ObjectUpdateCached", process_cached_object_update );
@@ -3537,7 +3537,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFunc("TeleportFailed", process_teleport_failed, NULL);
msg->setHandlerFunc("TeleportLocal", process_teleport_local, NULL);
msg->setHandlerFunc("ImageNotInDatabase", LLViewerImageList::processImageNotInDatabase, NULL);
msg->setHandlerFunc("ImageNotInDatabase", LLViewerTextureList::processImageNotInDatabase, NULL);
msg->setHandlerFuncFast(_PREHASH_GroupMembersReply,
LLGroupMgr::processGroupMembersReply);
@@ -3678,9 +3678,9 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
// location_id = 1 => home position
void init_start_screen(S32 location_id)
{
if (gStartImageGL.notNull())
if (gStartTexture.notNull())
{
gStartImageGL = NULL;
gStartTexture = NULL;
LL_INFOS("AppInit") << "re-initializing start screen" << LL_ENDL;
}
@@ -3712,7 +3712,6 @@ void init_start_screen(S32 location_id)
return;
}
gStartImageGL = new LLImageGL(FALSE);
gStartImageWidth = start_image_bmp->getWidth();
gStartImageHeight = start_image_bmp->getHeight();
@@ -3720,12 +3719,12 @@ void init_start_screen(S32 location_id)
if (!start_image_bmp->decode(raw, 0.0f))
{
LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;
gStartImageGL = NULL;
gStartTexture = NULL;
return;
}
raw->expandToPowerOfTwo();
gStartImageGL->createGLTexture(0, raw, 0, TRUE, LLViewerImageBoostLevel::OTHER);
gStartTexture = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE) ;
}
@@ -3733,7 +3732,7 @@ void init_start_screen(S32 location_id)
void release_start_screen()
{
LL_DEBUGS("AppInit") << "Releasing bitmap..." << LL_ENDL;
gStartImageGL = NULL;
gStartTexture = NULL;
}