Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up a few glowies.

Browse Source
This commit is contained in:
Shyotl
2013-11-02 19:15:28 -05:00
parent 77eb928380
commit 827bbc9b89
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
View File

@@ -166,10 +166,15 @@ void main()
vec3 pos = vary_position; vec3 pos = vary_position;
vec4 fogged = applyWaterFogDeferred(pos, vec4(color.rgb, final_alpha)); vec4 fogged = applyWaterFogDeferred(pos, vec4(color.rgb, final_alpha));
color.rgb = fogged.rgb; color.rgb = fogged.rgb;
#ifndef HAS_ALPHA_MASK
color.a = fogged.a; color.a = fogged.a;
#else #endif
#elif !HAS_ALPHA_MASK
color.a = final_alpha; color.a = final_alpha;
#endif #endif
#if HAS_ALPHA_MASK
color.a = 0.0;
#endif
frag_color.rgb = color.rgb; frag_color.rgb = color.rgb;
frag_color.a = color.a; frag_color.a = color.a;

2
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
View File

@@ -63,7 +63,7 @@ void main()
color.rgb = fullbrightShinyAtmosTransport(color.rgb); color.rgb = fullbrightShinyAtmosTransport(color.rgb);
color.rgb = fullbrightScaleSoftClip(color.rgb); color.rgb = fullbrightScaleSoftClip(color.rgb);
color.a = 1.0; color.a = 0.0;
color.rgb = pow(color.rgb, vec3(1.0/2.2)); color.rgb = pow(color.rgb, vec3(1.0/2.2));

4
indra/newview/lldrawpoolsimple.cpp
View File

@@ -563,7 +563,7 @@ void LLDrawPoolFullbright::renderPostDeferred(S32 pass)
{ {
LLFastTimer t(FTM_RENDER_FULLBRIGHT); LLFastTimer t(FTM_RENDER_FULLBRIGHT);
gGL.setColorMask(true, true); gGL.setColorMask(true, true);
gGL.setSceneBlendType(LLRender::BT_ALPHA); LLGLDisable blend(GL_BLEND);
U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXTURE_INDEX; U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXTURE_INDEX;
pushBatches(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask, TRUE, TRUE); pushBatches(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask, TRUE, TRUE);
@@ -689,9 +689,11 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass)
void LLDrawPoolFullbrightAlphaMask::renderPostDeferred(S32 pass) void LLDrawPoolFullbrightAlphaMask::renderPostDeferred(S32 pass)
{ {
LLFastTimer t(FTM_RENDER_FULLBRIGHT); LLFastTimer t(FTM_RENDER_FULLBRIGHT);
gGL.setColorMask(true, true);
LLGLDisable blend(GL_BLEND); LLGLDisable blend(GL_BLEND);
U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXTURE_INDEX; U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXTURE_INDEX;
pushMaskBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, fullbright_mask, TRUE, TRUE); pushMaskBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, fullbright_mask, TRUE, TRUE);
gGL.setColorMask(true, false);
} }
void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass) void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass)

6
indra/newview/pipeline.cpp
View File

@@ -8928,10 +8928,10 @@ void LLPipeline::renderDeferredLightingToRT(LLRenderTarget* target)
pushRenderTypeMask(); pushRenderTypeMask();
andRenderTypeMask(LLPipeline::RENDER_TYPE_ALPHA, andRenderTypeMask(LLPipeline::RENDER_TYPE_ALPHA,
LLPipeline::RENDER_TYPE_FULLBRIGHT, LLPipeline::RENDER_TYPE_FULLBRIGHT,
LLPipeline::RENDER_TYPE_VOLUME, //LLPipeline::RENDER_TYPE_VOLUME,
LLPipeline::RENDER_TYPE_GLOW, LLPipeline::RENDER_TYPE_GLOW,
LLPipeline::RENDER_TYPE_BUMP, LLPipeline::RENDER_TYPE_BUMP,
LLPipeline::RENDER_TYPE_PASS_SIMPLE, /*LLPipeline::RENDER_TYPE_PASS_SIMPLE, //These aren't used.
LLPipeline::RENDER_TYPE_PASS_ALPHA, LLPipeline::RENDER_TYPE_PASS_ALPHA,
LLPipeline::RENDER_TYPE_PASS_ALPHA_MASK, LLPipeline::RENDER_TYPE_PASS_ALPHA_MASK,
LLPipeline::RENDER_TYPE_PASS_BUMP, LLPipeline::RENDER_TYPE_PASS_BUMP,
@@ -8943,7 +8943,7 @@ void LLPipeline::renderDeferredLightingToRT(LLRenderTarget* target)
LLPipeline::RENDER_TYPE_PASS_GRASS, LLPipeline::RENDER_TYPE_PASS_GRASS,
LLPipeline::RENDER_TYPE_PASS_SHINY, LLPipeline::RENDER_TYPE_PASS_SHINY,
LLPipeline::RENDER_TYPE_PASS_INVISIBLE, LLPipeline::RENDER_TYPE_PASS_INVISIBLE,
LLPipeline::RENDER_TYPE_PASS_INVISI_SHINY, LLPipeline::RENDER_TYPE_PASS_INVISI_SHINY,*/
LLPipeline::RENDER_TYPE_AVATAR, LLPipeline::RENDER_TYPE_AVATAR,
LLPipeline::RENDER_TYPE_ALPHA_MASK, LLPipeline::RENDER_TYPE_ALPHA_MASK,
LLPipeline::RENDER_TYPE_FULLBRIGHT_ALPHA_MASK, LLPipeline::RENDER_TYPE_FULLBRIGHT_ALPHA_MASK,