Browse Source

Converted the Blur shader.

Lasse Öörni 12 years ago
parent
commit
d8983e7cff

+ 19 - 6
Bin/CoreData/Shaders/GLSL/Blur.frag → Bin/CoreData/Shaders/GLSL/Blur.glsl

@@ -1,16 +1,29 @@
-#include "Uniforms.frag"
-#include "Samplers.frag"
-#include "PostProcess.frag"
+#include "Uniforms.glsl"
+#include "Samplers.glsl"
+#include "Transform.glsl"
+#include "ScreenPos.glsl"
+#include "PostProcess.glsl"
 
+varying vec2 vTexCoord;
+varying vec2 vScreenPos;
+
+#ifdef COMPILEPS
 uniform vec2 cBlurDir;
 uniform float cBlurRadius;
 uniform float cBlurSigma;
 uniform vec2 cBlurHInvSize;
+#endif
 
-varying vec2 vTexCoord;
-varying vec2 vScreenPos;
+void VS()
+{
+    mat4 modelMatrix = iModelMatrix;
+    vec3 worldPos = GetWorldPos(modelMatrix);
+    gl_Position = GetClipPos(worldPos);
+    vTexCoord = GetQuadTexCoord(gl_Position);
+    vScreenPos = GetScreenPosPreDiv(gl_Position);
+}
 
-void main()
+void PS()
 {
     #ifdef BLUR3
         gl_FragColor = GaussianBlur(3, cBlurDir, cBlurHInvSize * cBlurRadius, cBlurSigma, sDiffMap, vTexCoord);

+ 0 - 15
Bin/CoreData/Shaders/GLSL/Blur.vert

@@ -1,15 +0,0 @@
-#include "Uniforms.vert"
-#include "Transform.vert"
-#include "ScreenPos.vert"
-
-varying vec2 vTexCoord;
-varying vec2 vScreenPos;
-
-void main()
-{
-    mat4 modelMatrix = iModelMatrix;
-    vec3 worldPos = GetWorldPos(modelMatrix);
-    gl_Position = GetClipPos(worldPos);
-    vTexCoord = GetQuadTexCoord(gl_Position);
-    vScreenPos = GetScreenPosPreDiv(gl_Position);
-}

+ 0 - 9
Bin/CoreData/Shaders/GLSL/Blur.xml

@@ -1,9 +0,0 @@
-<shaders>
-    <shader type="vs" />
-    <shader type="ps">
-    	<variation name="Blur3" define="BLUR3" />
-        <variation name="Blur5" define="BLUR5" />
-        <variation name="Blur7" define="BLUR7" />
-        <variation name="Blur9" define="BLUR9" />
-    </shader>
-</shaders>

+ 0 - 9
Bin/CoreData/Shaders/HLSL/Blur.xml

@@ -1,9 +0,0 @@
-<shaders>
-    <shader type="vs" />
-    <shader type="ps">
-    	<variation name="Blur3" define="BLUR3" />
-        <variation name="Blur5" define="BLUR5" />
-        <variation name="Blur7" define="BLUR7" />
-        <variation name="Blur9" define="BLUR9" />
-    </shader>
-</shaders>