diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-29 19:32:56 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-29 19:32:56 -0500 |
commit | 7238714634e72dacc4b09c1c4ee98b16fb0c91fe (patch) | |
tree | 89500aeb877bcf5b3d00f0c96ec0f0321834de1e /indra/llrender | |
parent | 973fefc8d9014f6389b4c3f9633ce398fdf5399e (diff) |
SH-2507 Potential fix for basic shaders causing objects to disappear with some drivers (prune shader tree of unused shaders while we're at it)
Diffstat (limited to 'indra/llrender')
-rw-r--r-- | indra/llrender/llrender.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 8ba164fcc9..bbdd0a7a60 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1,4 +1,4 @@ -/** + /** * @file llrender.cpp * @brief LLRender implementation * @@ -1132,6 +1132,8 @@ void LLRender::syncLightState() shader->uniform3fv("light_attenuation", 8, attenuation[0].mV); shader->uniform3fv("light_diffuse", 8, diffuse[0].mV); shader->uniform4fv("light_ambient", 1, mAmbientLightColor.mV); + //HACK -- duplicate sunlight color for compatibility with drivers that can't deal with multiple shader objects referencing the same uniform + shader->uniform4fv("sunlight_color", 1, diffuse[0].mV); } } |