Skip to content
Snippets Groups Projects
Commit ac018153 authored by Graham Madarasz's avatar Graham Madarasz
Browse files

MAINT-2632 speculative guards in display_startup based on prevalence of...

MAINT-2632 speculative guards in display_startup based on prevalence of crashes ending there (no repro, unfortunately)
parent 8ad2c0b8
No related branches found
No related tags found
No related merge requests found
...@@ -115,7 +115,8 @@ void render_disconnected_background(); ...@@ -115,7 +115,8 @@ void render_disconnected_background();
void display_startup() void display_startup()
{ {
if ( !gViewerWindow->getActive() if ( !gViewerWindow
|| !gViewerWindow->getActive()
|| !gViewerWindow->getWindow()->getVisible() || !gViewerWindow->getWindow()->getVisible()
|| gViewerWindow->getWindow()->getMinimized() ) || gViewerWindow->getWindow()->getMinimized() )
{ {
...@@ -126,7 +127,7 @@ void display_startup() ...@@ -126,7 +127,7 @@ void display_startup()
// Update images? // Update images?
//gImageList.updateImages(0.01f); //gImageList.updateImages(0.01f);
LLTexUnit::sWhiteTexture = LLViewerFetchedTexture::sWhiteImagep->getTexName(); LLTexUnit::sWhiteTexture = !LLViewerFetchedTexture::sWhiteImagep.isNull() ? LLViewerFetchedTexture::sWhiteImagep->getTexName() : NULL;
LLGLSDefault gls_default; LLGLSDefault gls_default;
...@@ -148,10 +149,12 @@ void display_startup() ...@@ -148,10 +149,12 @@ void display_startup()
LLGLSUIDefault gls_ui; LLGLSUIDefault gls_ui;
gPipeline.disableLights(); gPipeline.disableLights();
if (gViewerWindow)
gViewerWindow->setup2DRender(); gViewerWindow->setup2DRender();
gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT); gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
gGL.color4f(1,1,1,1); gGL.color4f(1,1,1,1);
if (gViewerWindow)
gViewerWindow->draw(); gViewerWindow->draw();
gGL.flush(); gGL.flush();
...@@ -160,7 +163,9 @@ void display_startup() ...@@ -160,7 +163,9 @@ void display_startup()
LLGLState::checkStates(); LLGLState::checkStates();
LLGLState::checkTextureChannels(); LLGLState::checkTextureChannels();
if (gViewerWindow && gViewerWindow->getWindow())
gViewerWindow->getWindow()->swapBuffers(); gViewerWindow->getWindow()->swapBuffers();
glClear(GL_DEPTH_BUFFER_BIT); glClear(GL_DEPTH_BUFFER_BIT);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment