From dc3d2b5b49eedd9e142cc5a6281cfa1044af034c Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Fri, 28 Oct 2011 16:09:09 +0100
Subject: [PATCH] Remove an unused sampler from the water shader, which caused
 OpenGL errors on Mac+Ati.

---
 Effects/water.eff  | 9 ---------
 Shaders/water.frag | 2 --
 2 files changed, 11 deletions(-)

diff --git a/Effects/water.eff b/Effects/water.eff
index 59e484e5a..4a6b3d289 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -251,10 +251,6 @@
 					<use>texture[6]/internal-format</use>
 				</internal-format>
 			</texture-unit>
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/water.vert</vertex-shader>
 				<fragment-shader>Shaders/water.frag</fragment-shader>
@@ -366,11 +362,6 @@
 					<use>wind-from</use>
 				</value>
 			</uniform>
-			<uniform>
-				<name>Noise</name>
-				<type>sampler-3d</type>
-				<value type="int">9</value>
-			</uniform>
 		</pass>
 	</technique>
 	<technique n="9">
diff --git a/Shaders/water.frag b/Shaders/water.frag
index 545dc8de1..13bc5101c 100644
--- a/Shaders/water.frag
+++ b/Shaders/water.frag
@@ -14,8 +14,6 @@ uniform sampler2D water_reflection_grey;
 uniform sampler2D sea_foam;
 uniform sampler2D perlin_normalmap;
 
-uniform sampler3D Noise;
-
 uniform float saturation, Overcast, WindE, WindN;
 uniform float CloudCover0, CloudCover1, CloudCover2, CloudCover3, CloudCover4;
 uniform float osg_SimulationTime;