livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in graham_linden/viewer-eep-rc-fixes (pull request #285) 

SL-9806
meow-7.2.2
Rider Linden 2019-02-25 21:05:08 +00:00
parent 6456518135 4879438b14
commit 738ea418a8
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
View File

@ -52,7 +52,8 @@ void main()
c.rgb = fullbrightAtmosTransport(c.rgb);
c.rgb = fullbrightScaleSoftClip(c.rgb);
c.a *= sun_fade;
// SL-9806 stars poke through
//c.a *= sun_fade;
frag_data[0] = c;
frag_data[1] = vec4(0.0f);

4
indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
View File

@ -47,7 +47,9 @@ void main()
vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
vec4 c = mix(sunA, sunB, blend_factor);
c.a *= sun_fade;
// SL-9806 stars poke through
// c.a *= sun_fade;
c.rgb = pow(c.rgb, vec3(0.7f));
c.rgb = fullbrightAtmosTransport(c.rgb);

2
indra/newview/lldrawpoolwater.cpp
View File

@ -619,8 +619,6 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li
{
LLGLDisable cullface(GL_CULL_FACE);
sNeedsReflectionUpdate = TRUE;
sNeedsDistortionUpdate = TRUE;

3
indra/newview/pipeline.h
View File

@ -281,7 +281,8 @@ public:
void unbindDeferredShader(LLGLSLShader& shader);
void renderDeferredLighting(LLRenderTarget* light_target);
void postDeferredGammaCorrect(LLRenderTarget* screen_target);
void generateWaterReflection(LLCamera& camera);
void generateSunShadow(LLCamera& camera);
LLRenderTarget* getShadowTarget(U32 i);