[Performous-commit] Lasse Karkkainen : Fix shaders to comply with OpenGL 2.1 (GLSL #version 120 ).

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

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed May 25 04:35:05 2011 +0300

Fix shaders to comply with OpenGL 2.1 (GLSL #version 120).

---

 data/shaders/core.frag      |    6 +++---
 data/shaders/core.vert      |    8 ++++----
 data/shaders/dancenote.vert |    8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/shaders/core.frag b/data/shaders/core.frag
index f7c7e28..9f5d966 100644
--- a/data/shaders/core.frag
+++ b/data/shaders/core.frag
@@ -9,11 +9,11 @@ uniform mat4 colorMatrix;
 in float bogus;  // Workaround for http://www.nvnews.net/vbulletin/showthread.php?p=2401097
 #endif
 
-in vec3 normal;
-in vec4 color;
+varying vec3 normal;
+varying vec4 color;
 
 #ifdef ENABLE_TEXTURING
-in vec4 texCoord;
+varying vec4 texCoord;
 #if ENABLE_TEXTURING == 1
 uniform sampler2DRect tex;
 #define TEXFUNC texture2DRect(tex, texCoord.st)
diff --git a/data/shaders/core.vert b/data/shaders/core.vert
index ee16a3d..926ca9b 100644
--- a/data/shaders/core.vert
+++ b/data/shaders/core.vert
@@ -5,10 +5,10 @@
 uniform mat4 positionMatrix;
 uniform mat3 normalMatrix;
 
-in vec4 vertPos;
-in vec4 vertTexCoord;
-in vec3 vertNormal;
-in vec4 vertColor;
+attribute vec4 vertPos;
+attribute vec4 vertTexCoord;
+attribute vec3 vertNormal;
+attribute vec4 vertColor;
 
 varying vec4 texCoord;
 varying vec4 vTexCoord;
diff --git a/data/shaders/dancenote.vert b/data/shaders/dancenote.vert
index 6d7df82..c9b9c92 100644
--- a/data/shaders/dancenote.vert
+++ b/data/shaders/dancenote.vert
@@ -8,10 +8,10 @@ uniform float clock;
 uniform float scale;
 uniform vec2 position;
 
-in vec4 vertPos;
-in vec4 vertTexCoord;
-in vec3 vertNormal;
-in vec4 vertColor;
+attribute vec4 vertPos;
+attribute vec4 vertTexCoord;
+attribute vec3 vertNormal;
+attribute vec4 vertColor;
 
 // Per-vextex for fragment shader (if no geometry shader)
 varying vec4 texCoord;