Merge pull request #471 from Sonicadvance1/sampler_binding

Support Sampler binding in the shader.

Data/Sys/Shaders/16bit.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/32bit.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/FXAA.glsl

@@ -12,7 +12,7 @@
 
 // 0. You just DO WHAT THE FUCK YOU WANT TO.
 
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/README.txt

@@ -1,5 +1,5 @@
 //dummy shader:
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;
@@ -15,4 +15,4 @@ For best results, turn Wordwrap formatting on...
 The shaders shown in the dropdown box in the video plugin configuration window are kept in the directory named User/Data/Shaders. They are linked in to the dolphin source from the repository at <http://dolphin-shaders-database.googlecode.com/svn/trunk/>. See <http://code.google.com/p/dolphin-shaders-database/wiki/Documentation> for more details on the way shaders work.
 
 This file will hopefully hold more content in future...
-*/
+*/

Data/Sys/Shaders/acidmetal.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/acidtrip.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/acidtrip2.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/asciiart.glsl

@@ -1,6 +1,6 @@
 // textures
-uniform sampler2D samp8;
-uniform sampler2D samp9;
+SAMPLER_BINDING(8) uniform sampler2D samp8;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 const int char_width = 8;
 const int char_height = 13;

Data/Sys/Shaders/auto_toon.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/auto_toon2.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/bad_bloom.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/brighten.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/chrismas.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/cool1.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/darkerbrighter.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/emboss.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/fire.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/fire2.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/firewater.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;

Data/Sys/Shaders/grayscale.glsl

@@ -1,4 +1,4 @@
-uniform sampler2D samp9;
+SAMPLER_BINDING(9) uniform sampler2D samp9;
 
 out vec4 ocol0;
 in vec2 uv0;