Lazy shader update. attribute -> ATTRIBUTE, varying -> VARYING. Moved some shader preprocessor stuff from llviewershadermgr.cpp to llshadermgr.cpp to match LL (although it looks more messy)

This commit is contained in:
Shyotl
2011-11-24 01:03:03 -06:00
parent 08d2c17c65
commit 8e7733b2ce
108 changed files with 263 additions and 232 deletions

View File

@@ -11,11 +11,11 @@ vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
mat4 getSkinnedTransform();
void calcAtmospherics(vec3 inPositionEye);
attribute vec4 clothing; //4
ATTRIBUTE vec4 clothing; //4
attribute vec4 gWindDir; //7
attribute vec4 gSinWaveParams; //3
attribute vec4 gGravity; //5
ATTRIBUTE vec4 gWindDir; //7
ATTRIBUTE vec4 gSinWaveParams; //3
ATTRIBUTE vec4 gGravity; //5
const vec4 gMinMaxConstants = vec4(1.0, 0.166666, 0.0083143, .00018542); // #minimax-generated coefficients
const vec4 gPiConstants = vec4(0.159154943, 6.28318530, 3.141592653, 1.5707963); // # {1/2PI, 2PI, PI, PI/2}

View File

@@ -17,7 +17,7 @@ uniform int kern_length;
uniform float kern_scale;
uniform vec3 blur_quad;
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform mat4 inv_proj;
uniform vec2 screen_res;

View File

@@ -7,7 +7,7 @@
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform vec2 screen_res;
void main()

View File

@@ -24,7 +24,7 @@ uniform sampler2D depthGIMap;
uniform sampler2D lightFunc;
// Inputs
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform vec2 screen_res;

View File

@@ -14,7 +14,7 @@ uniform sampler2D bloomMap;
uniform sampler2DRect edgeMap;
uniform vec2 screen_res;
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
void main()

View File

@@ -7,7 +7,7 @@
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform vec2 screen_res;
void main()

View File

@@ -7,7 +7,7 @@
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform vec2 screen_res;

View File

@@ -12,7 +12,7 @@
uniform sampler2DRect lightMap;
uniform sampler2DRect diffuseRect;
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
void main()
{
float i = texture2DRect(lightMap, vary_fragcoord.xy).r;

View File

@@ -7,7 +7,7 @@
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform vec2 screen_res;

View File

@@ -35,7 +35,7 @@ uniform float gi_luminance;
uniform vec4 sunlight_color;
uniform vec2 screen_res;
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
void main()
{

View File

@@ -7,7 +7,7 @@
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform vec2 screen_res;
void main()

View File

@@ -22,7 +22,7 @@ uniform float kern_scale;
uniform float gi_edge_weight;
uniform float gi_blur_brightness;
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
void main()
{

View File

@@ -7,7 +7,7 @@
varying vec2 vary_fragcoord;
VARYING vec2 vary_fragcoord;
uniform vec2 screen_res;
void main()

View File

@@ -45,8 +45,8 @@ uniform mat3 ssao_effect_mat;
uniform mat4 inv_proj;
uniform vec2 screen_res;
varying vec4 vary_light;
varying vec2 vary_fragcoord;
VARYING vec4 vary_light;
VARYING vec2 vary_fragcoord;
vec3 vary_PositionEye;

View File

@@ -9,8 +9,8 @@
uniform vec2 screen_res;
varying vec4 vary_light;
varying vec2 vary_fragcoord;
VARYING vec4 vary_light;
VARYING vec2 vary_fragcoord;
void main()
{
//transform vertex

View File

@@ -9,7 +9,7 @@
uniform sampler2D diffuseMap;
varying vec3 vary_normal;
VARYING vec3 vary_normal;
void main()
{