Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
This commit is contained in:
Shyotl
2011-12-09 14:02:29 -06:00
parent 8e7733b2ce
commit ffb285c6ff
499 changed files with 22321 additions and 12356 deletions

View File

@@ -43,6 +43,7 @@
#include "llviewerdisplay.h"
#include "llrender.h"
#include "llglslshader.h"
#include "pipeline.h"
// static
LLViewerDynamicTexture::instance_list_t LLViewerDynamicTexture::sInstances[ LLViewerDynamicTexture::ORDER_COUNT ];
@@ -206,7 +207,7 @@ void LLViewerDynamicTexture::postRender(BOOL success)
BOOL LLViewerDynamicTexture::updateAllInstances()
{
sNumRenders = 0;
if (gGLManager.mIsDisabled)
if (gGLManager.mIsDisabled || LLPipeline::sMemAllocationThrottled)
{
return TRUE;
}
@@ -214,11 +215,6 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
LLGLSLShader::bindNoShader();
LLVertexBuffer::unbind();
bool no_ff = LLGLSLShader::sNoFixedFunction;
static const LLCachedControl<bool> force_fixed_functions("ShyotlUseLegacyDynamicTexture",false);
if(force_fixed_functions)
LLGLSLShader::sNoFixedFunction = false;
BOOL result = FALSE;
BOOL ret = FALSE ;
for( S32 order = 0; order < ORDER_COUNT; order++ )
@@ -249,8 +245,6 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
}
}
LLGLSLShader::sNoFixedFunction = no_ff;
return ret;
}