From 41f42fc741646d014f6d1df9d5d1f88d89aff9be Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 23 Apr 2011 03:02:56 -0500
Subject: [PATCH] Nuking some glsl warnings, and fixing relwithdebug
 compile(and prolly gcc too)

---
 indra/newview/app_settings/shaders/class1/effects/glowF.glsl   | 2 ++
 indra/newview/app_settings/shaders/class2/effects/blurF.glsl   | 2 ++
 .../app_settings/shaders/class2/effects/colorFilterF.glsl      | 2 ++
 .../newview/app_settings/shaders/class2/effects/extractF.glsl  | 2 ++
 .../app_settings/shaders/class2/effects/gaussBlurF.glsl        | 3 +++
 .../app_settings/shaders/class2/effects/nightVisionF.glsl      | 2 ++
 indra/newview/app_settings/shaders/class2/effects/simpleF.glsl | 2 ++
 indra/newview/pipeline.cpp                                     | 2 +-
 8 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/shaders/class1/effects/glowF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowF.glsl
index f81867be6..817d6c1c5 100644
--- a/indra/newview/app_settings/shaders/class1/effects/glowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/effects/glowF.glsl
@@ -5,6 +5,8 @@
  * $License$
  */
 
+#version 120
+
 uniform sampler2D diffuseMap;
 uniform float glowStrength;
 
diff --git a/indra/newview/app_settings/shaders/class2/effects/blurF.glsl b/indra/newview/app_settings/shaders/class2/effects/blurF.glsl
index 7db969ef0..7edfebab2 100644
--- a/indra/newview/app_settings/shaders/class2/effects/blurF.glsl
+++ b/indra/newview/app_settings/shaders/class2/effects/blurF.glsl
@@ -5,6 +5,8 @@
  * $License$
  */
 
+#extension GL_ARB_texture_rectangle : enable
+
 uniform sampler2DRect RenderTexture;
 uniform float bloomStrength;
 
diff --git a/indra/newview/app_settings/shaders/class2/effects/colorFilterF.glsl b/indra/newview/app_settings/shaders/class2/effects/colorFilterF.glsl
index 4d5bf2538..729949a17 100644
--- a/indra/newview/app_settings/shaders/class2/effects/colorFilterF.glsl
+++ b/indra/newview/app_settings/shaders/class2/effects/colorFilterF.glsl
@@ -5,6 +5,8 @@
  * $License$
  */
 
+#extension GL_ARB_texture_rectangle : enable
+
 uniform sampler2DRect RenderTexture;
 uniform float brightness;
 uniform float contrast;
diff --git a/indra/newview/app_settings/shaders/class2/effects/extractF.glsl b/indra/newview/app_settings/shaders/class2/effects/extractF.glsl
index a1583b13e..f9eee5b89 100644
--- a/indra/newview/app_settings/shaders/class2/effects/extractF.glsl
+++ b/indra/newview/app_settings/shaders/class2/effects/extractF.glsl
@@ -5,6 +5,8 @@
  * $License$
  */
 
+#extension GL_ARB_texture_rectangle : enable
+
 uniform sampler2DRect RenderTexture;
 uniform float extractLow;
 uniform float extractHigh;
diff --git a/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl b/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
index 47c9f875b..f58622ab6 100644
--- a/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
+++ b/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
@@ -1,3 +1,6 @@
+
+#extension GL_ARB_texture_rectangle : enable
+
 uniform sampler2DRect RenderTexture;
 uniform int horizontalPass;
 
diff --git a/indra/newview/app_settings/shaders/class2/effects/nightVisionF.glsl b/indra/newview/app_settings/shaders/class2/effects/nightVisionF.glsl
index 271d5cf8d..833ef7d30 100644
--- a/indra/newview/app_settings/shaders/class2/effects/nightVisionF.glsl
+++ b/indra/newview/app_settings/shaders/class2/effects/nightVisionF.glsl
@@ -4,6 +4,8 @@
  * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
  * $License$
  */
+ 
+#extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect RenderTexture;
 uniform sampler2D NoiseTexture;
diff --git a/indra/newview/app_settings/shaders/class2/effects/simpleF.glsl b/indra/newview/app_settings/shaders/class2/effects/simpleF.glsl
index e55d278b8..3a236846c 100644
--- a/indra/newview/app_settings/shaders/class2/effects/simpleF.glsl
+++ b/indra/newview/app_settings/shaders/class2/effects/simpleF.glsl
@@ -5,6 +5,8 @@
  * $License$
  */
 
+#extension GL_ARB_texture_rectangle : enable
+
 uniform sampler2DRect RenderTexture;
 
 void main(void) 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1394b592a..5c69cb18c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -5892,7 +5892,7 @@ void LLPipeline::renderDeferredLighting()
 		bindDeferredShader(gDeferredBlurLightProgram);
 
 		static const LLCachedControl<LLVector3> go("RenderShadowGaussian",LLVector3(2.f,2.f,0.f));
-		static const LLCachedControl<F32> blur_size("RenderShadowBlurSize",.7);
+		static const LLCachedControl<F32> blur_size("RenderShadowBlurSize",.7f);
 		static const LLCachedControl<U32> blur_samples("RenderShadowBlurSamples",(U32)5);
 		U32 kern_length = llclamp(blur_samples.get(), (U32) 1, (U32) 16)*2 - 1;