From ef83211c4674df9f07f5ac69476691d88652769c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 10 Dec 2013 11:48:17 +0100 Subject: [PATCH] Shaders: fix textured Flat on systems w/o ARB_explicit_attribute_location. How could I possibly overlook this. --- src/Shaders/Flat.frag | 4 ++-- src/Shaders/Flat2D.vert | 8 ++++---- src/Shaders/Flat3D.vert | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Shaders/Flat.frag b/src/Shaders/Flat.frag index 2cd2453e7..35e85bfcd 100644 --- a/src/Shaders/Flat.frag +++ b/src/Shaders/Flat.frag @@ -43,7 +43,7 @@ uniform lowp vec4 color; #endif #ifdef TEXTURED -in mediump vec2 interpolatedTextureCoords; +in mediump vec2 interpolatedTextureCoordinates; #endif #ifdef NEW_GLSL @@ -52,7 +52,7 @@ out lowp vec4 fragmentColor; void main() { #ifdef TEXTURED - fragmentColor = texture(textureData, interpolatedTextureCoords); + fragmentColor = texture(textureData, interpolatedTextureCoordinates); #else fragmentColor = color; #endif diff --git a/src/Shaders/Flat2D.vert b/src/Shaders/Flat2D.vert index 34bd475af..b06a8839d 100644 --- a/src/Shaders/Flat2D.vert +++ b/src/Shaders/Flat2D.vert @@ -41,11 +41,11 @@ in highp vec2 position; #ifdef TEXTURED #ifdef EXPLICIT_ATTRIB_LOCATION -layout(location = TEXTURECOORDINATES_ATTRIBUTE_LOCATION) in mediump vec2 textureCoords; +layout(location = TEXTURECOORDINATES_ATTRIBUTE_LOCATION) in mediump vec2 textureCoordinates; #else -in mediump vec2 textureCoords; +in mediump vec2 textureCoordinates; #endif -out mediump vec2 interpolatedTextureCoords; +out mediump vec2 interpolatedTextureCoordinates; #endif void main() { @@ -53,6 +53,6 @@ void main() { #ifdef TEXTURED /* Texture coordinates, if needed */ - interpolatedTextureCoords = textureCoords; + interpolatedTextureCoordinates = textureCoordinates; #endif } diff --git a/src/Shaders/Flat3D.vert b/src/Shaders/Flat3D.vert index 000db457f..12b8d1a2d 100644 --- a/src/Shaders/Flat3D.vert +++ b/src/Shaders/Flat3D.vert @@ -41,11 +41,11 @@ in highp vec4 position; #ifdef TEXTURED #ifdef EXPLICIT_ATTRIB_LOCATION -layout(location = TEXTURECOORDINATES_ATTRIBUTE_LOCATION) in mediump vec2 textureCoords; +layout(location = TEXTURECOORDINATES_ATTRIBUTE_LOCATION) in mediump vec2 textureCoordinates; #else -in mediump vec2 textureCoords; +in mediump vec2 textureCoordinates; #endif -out mediump vec2 interpolatedTextureCoords; +out mediump vec2 interpolatedTextureCoordinates; #endif void main() { @@ -53,6 +53,6 @@ void main() { #ifdef TEXTURED /* Texture coordinates, if needed */ - interpolatedTextureCoords = textureCoords; + interpolatedTextureCoordinates = textureCoordinates; #endif }