diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-08 09:25:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 09:25:41 -0400 |
| commit | ccb3ad90001c2b19cbd690d67317651ee0182f42 (patch) | |
| tree | 6ddb1c9c73a4c3664c26271545f30a160c6fadc1 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) | |
| parent | 36a05ebd9a2a969bab4621f522a9a82f69e523d7 (diff) | |
merge changes for storm-1485
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(); + } } } |