From 71e986b0597341f9fcfb28f71bfbc46d65f08d88 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 23 Sep 2013 14:49:10 -0700
Subject: [PATCH] NORSPEC-285 fix merge error with attenuation on alpha
masquerading as this norspec from wayback
---
indra/llrender/llrender.cpp | 6 +++---
indra/newview/pipeline.cpp | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index aa94110f4d0..0ac30b4d63a 100755
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -832,8 +832,8 @@ LLLightState::LLLightState(S32 index)
: mIndex(index),
mEnabled(false),
mConstantAtten(1.f),
- mLinearAtten(1.f),
- mQuadraticAtten(1.f),
+ mLinearAtten(0.f),
+ mQuadraticAtten(0.f),
mSpotExponent(0.f),
mSpotCutoff(180.f)
{
@@ -1150,7 +1150,7 @@ void LLRender::syncLightState()
position[i] = light->mPosition;
direction[i] = light->mSpotDirection;
- attenuation[i].set(1.f/light->mLinearAtten, light->mQuadraticAtten, light->mSpecular.mV[3]);
+ attenuation[i].set(light->mLinearAtten, light->mQuadraticAtten, light->mSpecular.mV[3]);
diffuse[i].set(light->mDiffuse.mV);
}
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 9f808776ecf..b0c73d03049 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -122,6 +122,10 @@
//#define DEBUG_INDICES
#endif
+// Expensive and currently broken
+//
+#define MATERIALS_IN_REFLECTIONS 0
+
bool gShiftFrame = false;
//cached settings
@@ -8477,6 +8481,7 @@ void LLPipeline::renderDeferredLighting()
}
gDeferredSunProgram.uniform3fv(sOffset, slice, offset);
+ gDeferredSunProgram.uniform2f(LLShaderMgr::DEFERRED_SCREEN_RES, mDeferredLight.getWidth(), mDeferredLight.getHeight());
{
LLGLDisable blend(GL_BLEND);
--
GitLab