[Performous-commit] Lasse Karkkainen : Shader cleanup

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: opengl2
Commit: d00731cc957af82393ad682ba2d8d788132ccb8f

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Feb  8 21:31:51 2011 +0100

Shader cleanup

---

 themes/default/shaders/core.frag     |   21 ++++++++++-----------
 themes/default/shaders/core.vert     |    1 +
 themes/default/shaders/stereo3d.geom |    8 ++------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/themes/default/shaders/core.frag b/themes/default/shaders/core.frag
index 8b61013..02e7080 100644
--- a/themes/default/shaders/core.frag
+++ b/themes/default/shaders/core.frag
@@ -1,28 +1,27 @@
-#version 330
+#version 120
 #extension GL_ARB_texture_rectangle : require
 
 //DEFINES
 
 #ifdef SURFACE
 uniform sampler2DRect tex;
-#define TFUNC texture2DRect
+in vec2 texcoord;
+#define TEXFUNC texture2DRect(tex, texcoord)
 #endif
 
 #ifdef TEXTURE
 uniform sampler2D tex;
-#define TFUNC texture2D
+in vec2 texcoord;
+#define TEXFUNC texture2D(tex, texcoord)
 #endif
 
-uniform mat4 colorMatrix;
+#ifndef TEXFUNC
+#define TEXFUNC vec4(1,1,1,1)
+#endif
 
-in vec4 color;
-in vec2 texcoord;
+uniform mat4 colorMatrix;
 
 void main() {
-	gl_FragColor = colorMatrix * (color
-#ifdef TFUNC
-	  * TFUNC(tex, texcoord).rgba
-#endif
-	  );
+	gl_FragColor = colorMatrix * TEXFUNC;
 }
 
diff --git a/themes/default/shaders/core.vert b/themes/default/shaders/core.vert
index d448a12..02a36a0 100644
--- a/themes/default/shaders/core.vert
+++ b/themes/default/shaders/core.vert
@@ -7,3 +7,4 @@ void main() {
 	gl_TexCoord[0] = gl_MultiTexCoord0;
 	gl_Position = gl_ModelViewProjectionMatrix * vertex;
 }
+
diff --git a/themes/default/shaders/stereo3d.geom b/themes/default/shaders/stereo3d.geom
index a17d8a4..b143d43 100644
--- a/themes/default/shaders/stereo3d.geom
+++ b/themes/default/shaders/stereo3d.geom
@@ -1,4 +1,4 @@
-#version 330 compatibility
+#version 330
 #extension GL_ARB_viewport_array : require
 
 layout(triangles) in;
@@ -7,18 +7,15 @@ layout(triangle_strip, max_vertices = 6) out;
 uniform mat4 leftTransform;
 uniform mat4 rightTransform;
 
-out vec4 color;
 out vec2 texcoord;
 
 void main() {
-	// Fix Nvidia compile warnings ("may be used uninitialized")
-	color = vec4(0);
+	// Fix Nvidia compile warnings ("might be used uninitialized")
 	texcoord = vec2(0);
 	gl_Position = vec4(0);
 	// Render the left eye
 	gl_ViewportIndex = 0;
 	for(int i=0; i < gl_in.length(); ++i) {
-		color = gl_in[i].gl_FrontColor;
 		texcoord = gl_in[i].gl_TexCoord[0].st;
 		gl_Position = leftTransform * gl_in[i].gl_Position;
 		EmitVertex();
@@ -27,7 +24,6 @@ void main() {
 	// Render the right eye
 	gl_ViewportIndex = 1;
 	for(int i=0; i < gl_in.length(); ++i) {
-		color = gl_in[i].gl_FrontColor;
 		texcoord = gl_in[i].gl_TexCoord[0].st;
 		gl_Position = rightTransform * gl_in[i].gl_Position;
 		EmitVertex();