summaryrefslogtreecommitdiff
path: root/indra/newview/llwlparammanager.h
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-30 15:29:53 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-30 15:29:53 -0800
commitc4084c71386e34f6c28d4c10199eaf1155a2855b (patch)
treeac0db937e8a95223fd2721e18041a2ed605139e6 /indra/newview/llwlparammanager.h
parent17b21fc197f162a4070083c436920c0640431568 (diff)
SH-2592 PROGRESS -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled on Intel HD 3000, 10.7.2
Refactored WindLight estate settings to use float uniforms in the shaders that only need it, rather than vec4's for everything.
Diffstat (limited to 'indra/newview/llwlparammanager.h')
-rw-r--r--indra/newview/llwlparammanager.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h
index bc984b9126..72422500fc 100644
--- a/indra/newview/llwlparammanager.h
+++ b/indra/newview/llwlparammanager.h
@@ -102,9 +102,8 @@ struct WLFloatControl {
{
}
- inline WLFloatControl & operator = (LLVector4 const & val) {
- x = val.mV[0];
-
+ inline WLFloatControl & operator = (F32 val) {
+ x = val;
return *this;
}
@@ -340,10 +339,10 @@ public:
/// Atmospherics
WLColorControl mBlueHorizon;
- WLColorControl mHazeDensity;
+ WLFloatControl mHazeDensity;
WLColorControl mBlueDensity;
WLFloatControl mDensityMult;
- WLColorControl mHazeHorizon;
+ WLFloatControl mHazeHorizon;
WLFloatControl mMaxAlt;
/// Lighting