From 6d52efe452aa8469e0343da1c7d108f3f52ab651 Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Wed, 27 Feb 2008 18:58:14 +0000 Subject: Merge of windlight into release (QAR-286). This includes all changes in windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 --- indra/newview/lldynamictexture.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'indra/newview/lldynamictexture.cpp') diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 8f6b572a9d..a4b3d259bb 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -40,7 +40,10 @@ #include "llviewercontrol.h" #include "llviewerimage.h" #include "llvertexbuffer.h" +#include "llviewerdisplay.h" +#include "llglimmediate.h" +void render_ui_and_swap_if_needed(); // static LLLinkedList LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ]; @@ -216,15 +219,22 @@ BOOL LLDynamicTexture::updateAllInstances() dynamicTexture = LLDynamicTexture::sInstances[order].getNextData()) { if (dynamicTexture->needsRender()) - { + { + render_ui_and_swap_if_needed(); + glClear(GL_DEPTH_BUFFER_BIT); + gDisplaySwapBuffers = FALSE; + + LLVertexBuffer::startRender(); + gGL.start(); + dynamicTexture->preRender(); // Must be called outside of startRender() - LLVertexBuffer::startRender(); if (dynamicTexture->render()) { result = TRUE; sNumRenders++; } + gGL.stop(); LLVertexBuffer::stopRender(); dynamicTexture->postRender(result); -- cgit v1.2.3