fly/fgdata
1
0
Fork 0
Code Activity

Remove an unused sampler from the water shader, which caused OpenGL errors on Mac+Ati.

Browse source
This commit is contained in:
James Turner 2011-10-28 16:09:09 +01:00
parent a957cf9797
commit dc3d2b5b49
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Effects/water.eff
View file

@ -251,10 +251,6 @@
<use>texture[6]/internal-format</use> <use>texture[6]/internal-format</use>
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<texture-unit>
<unit>9</unit>
<type>noise</type>
</texture-unit>
<program> <program>
<vertex-shader>Shaders/water.vert</vertex-shader> <vertex-shader>Shaders/water.vert</vertex-shader>
<fragment-shader>Shaders/water.frag</fragment-shader> <fragment-shader>Shaders/water.frag</fragment-shader>
@ -366,11 +362,6 @@
<use>wind-from</use> <use>wind-from</use>
</value> </value>
</uniform> </uniform>
<uniform>
<name>Noise</name>
<type>sampler-3d</type>
<value type="int">9</value>
</uniform>
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="9">

2
Shaders/water.frag
View file

@ -14,8 +14,6 @@ uniform sampler2D water_reflection_grey;
uniform sampler2D sea_foam; uniform sampler2D sea_foam;
uniform sampler2D perlin_normalmap; uniform sampler2D perlin_normalmap;
uniform sampler3D Noise;
uniform float saturation, Overcast, WindE, WindN; uniform float saturation, Overcast, WindE, WindN;
uniform float CloudCover0, CloudCover1, CloudCover2, CloudCover3, CloudCover4; uniform float CloudCover0, CloudCover1, CloudCover2, CloudCover3, CloudCover4;
uniform float osg_SimulationTime; uniform float osg_SimulationTime;