Devel

Samples/Media/materials/programs/GLSL/hdr_bloom.glsl

@@ -1,11 +1,13 @@
-uniform sampler2D inRTT;
+#include "OgreUnifiedShader.h"
+
+SAMPLER2D(inRTT, 0);
 
 uniform vec4 sampleOffsets[15];
 uniform vec4 sampleWeights[15];
 
-varying vec2 oUv0;
-
-void main(void)
+MAIN_PARAMETERS
+IN(vec2 oUv0, TEXCOORD0)
+MAIN_DECLARATION
 {
     vec4 accum = vec4(0.0, 0.0, 0.0, 1.0);
 	vec2 sampleUV;

Samples/Media/materials/programs/GLSL/hdr_downscale2x2luminence.glsl

@@ -1,13 +1,16 @@
-uniform sampler2D inRTT;
+#include "OgreUnifiedShader.h"
+
+SAMPLER2D(inRTT, 0);
+
 uniform vec2 texelSize;
 
-varying vec2 oUv0;
+STATIC const vec4 LUMINENCE_FACTOR  = vec4(0.27, 0.67, 0.06, 0.0); // NTSC (1953)
 
-void main(void)
+MAIN_PARAMETERS
+IN(vec2 oUv0, TEXCOORD0)
+MAIN_DECLARATION
 {
-
     vec4 accum = vec4(0.0, 0.0, 0.0, 0.0);
-	vec4 LUMINENCE_FACTOR  = vec4(0.27, 0.67, 0.06, 0.0);
 
     // Get colour from source
     accum += texture2D(inRTT, oUv0 + texelSize * vec2(-0.5, -0.5));

Samples/Media/materials/programs/GLSL/hdr_downscale3x3.glsl

@@ -1,9 +1,11 @@
-uniform sampler2D inRTT;
-uniform vec2 texelSize;
+#include "OgreUnifiedShader.h"
 
-varying vec2 oUv0;
+SAMPLER2D(inRTT, 0);
+uniform vec2 texelSize;
 
-void main(void)
+MAIN_PARAMETERS
+IN(vec2 oUv0, TEXCOORD0)
+MAIN_DECLARATION
 {
     vec4 accum = vec4(0.0, 0.0, 0.0, 0.0);
 

Samples/Media/materials/programs/GLSL/hdr_downscale3x3brightpass.glsl

@@ -1,13 +1,17 @@
-uniform sampler2D inRTT;
-uniform sampler2D inLum;
-uniform vec2 texelSize;
-
-varying vec2 oUv0;
-const vec4 BRIGHT_LIMITER = vec4(0.6, 0.6, 0.6, 0.0);
+#include "OgreUnifiedShader.h"
 
 #include "hdr_tonemap_util.glsl"
 
-void main(void)
+SAMPLER2D(inRTT, 0);
+SAMPLER2D(inLum, 1);
+
+uniform vec2 texelSize;
+
+STATIC const vec4 BRIGHT_LIMITER = vec4(0.6, 0.6, 0.6, 0.0);
+
+MAIN_PARAMETERS
+IN(vec2 oUv0, TEXCOORD0)
+MAIN_DECLARATION
 {
     vec4 accum = vec4(0.0, 0.0, 0.0, 0.0);
 

Samples/Media/materials/programs/GLSL/hdr_finalToneMapping.glsl

@@ -1,12 +1,14 @@
-uniform sampler2D inRTT;
-uniform sampler2D inBloom;
-uniform sampler2D inLum;
-
-varying vec2 oUv0;
+#include "OgreUnifiedShader.h"
 
 #include "hdr_tonemap_util.glsl"
 
-void main(void)
+SAMPLER2D(inRTT, 0);
+SAMPLER2D(inBloom, 1);
+SAMPLER2D(inLum, 2);
+
+MAIN_PARAMETERS
+IN(vec2 oUv0, TEXCOORD0)
+MAIN_DECLARATION
 {
 	// Get main scene colour
     vec4 sceneCol = texture2D(inRTT, oUv0);

Samples/Media/materials/programs/GLSL/hdr_tonemap_util.glsl

@@ -1,6 +1,6 @@
-const float MIDDLE_GREY = 0.72;
-const float FUDGE = 0.001;
-const float L_WHITE = 1.5;
+STATIC const float MIDDLE_GREY = 0.72;
+STATIC const float FUDGE = 0.001;
+STATIC const float L_WHITE = 1.5;
 
 /** Tone mapping function 
 @note Only affects rgb, not a