Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
b58229a6
Commit
b58229a6
authored
13 years ago
by
David Parks
Browse files
Options
Downloads
Patches
Plain Diff
SH-1427 Fix for sunlight color getting clobbered for non-deferred atmospheric shaders.
parent
108cdf58
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llrender/llshadermgr.cpp
+1
-1
1 addition, 1 deletion
indra/llrender/llshadermgr.cpp
indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+2
-2
2 additions, 2 deletions
...ttings/shaders/class1/windlight/atmosphericsHelpersV.glsl
with
3 additions
and
3 deletions
indra/llrender/llshadermgr.cpp
+
1
−
1
View file @
b58229a6
...
...
@@ -974,7 +974,7 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms
.
push_back
(
"cloude_noise_texture"
);
mReservedUniforms
.
push_back
(
"fullbright"
);
mReservedUniforms
.
push_back
(
"lightnorm"
);
mReservedUniforms
.
push_back
(
"sunlight_color"
);
mReservedUniforms
.
push_back
(
"sunlight_color
_copy
"
);
mReservedUniforms
.
push_back
(
"ambient"
);
mReservedUniforms
.
push_back
(
"blue_horizon"
);
mReservedUniforms
.
push_back
(
"blue_density"
);
...
...
This diff is collapsed.
Click to expand it.
indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+
2
−
2
View file @
b58229a6
...
...
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
uniform
vec4
sunlight_color
;
uniform
vec4
sunlight_color
_copy
;
uniform
vec4
light_ambient
;
vec3
atmosAmbient
(
vec3
light
)
...
...
@@ -33,7 +33,7 @@ vec3 atmosAmbient(vec3 light)
vec3
atmosAffectDirectionalLight
(
float
lightIntensity
)
{
return
sunlight_color
.
rgb
*
lightIntensity
;
return
sunlight_color
_copy
.
rgb
*
lightIntensity
;
}
vec3
atmosGetDiffuseSunlightColor
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment