diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
| commit | 2c2a4c123eb9bfa80785e5509e73c8f7f236228f (patch) | |
| tree | 83160657e9c42e9dc78f6be455f254671429bc9c /indra/newview/lldrawpoolalpha.cpp | |
| parent | 74b6f5dce31b5ff69ced8e1e8cd37e4c5ded2943 (diff) | |
| parent | 95da8c81f3d5afd8d888589398028883e6647333 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 5e4d5319ec..ad7e3ad593 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -295,16 +295,24 @@ void LLDrawPoolAlpha::render(S32 pass) if (sShowDebugAlpha) { - if(gPipeline.canUseWindLightShaders()) + BOOL shaders = gPipeline.canUseVertexShaders(); + if(shaders) { - LLGLSLShader::bindNoShader(); + gObjectFullbrightNonIndexedProgram.bind(); + } + else + { + gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); } - gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); glColor4f(1,0,0,1); LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f); gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ; renderAlphaHighlight(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0); + if(shaders) + { + gObjectFullbrightNonIndexedProgram.unbind(); + } } } |