diff --git a/src/video/Basic.fsh b/src/video/Basic.fsh index 82cf529d..301646e2 100644 --- a/src/video/Basic.fsh +++ b/src/video/Basic.fsh @@ -21,7 +21,7 @@ varying vec2 varTexcoord; // global alpha value uniform float aValue; -uniform sampler2D texture; +uniform sampler2D aTexture; #if __VERSION__ >= 140 #define OUTPUT_TEXTURE(TEX) vec4 tex = texture(TEX, varTexcoord.st, 0.0); fragColor = vec4(tex.r, tex.g, tex.b, tex.a*aValue) @@ -31,5 +31,5 @@ uniform sampler2D texture; void main(void) { - OUTPUT_TEXTURE(texture); + OUTPUT_TEXTURE(aTexture); } diff --git a/src/video/glvideo.c b/src/video/glvideo.c index a941ab8a..e5916bf9 100644 --- a/src/video/glvideo.c +++ b/src/video/glvideo.c @@ -428,7 +428,7 @@ static GLuint _build_program(demoSource *vertexSource, demoSource *fragmentSourc // Setup common program input points // /////////////////////////////////////// - texSamplerLoc = glGetUniformLocation(prgName, "texture"); + texSamplerLoc = glGetUniformLocation(prgName, "aTexture"); if (texSamplerLoc < 0) { LOG("OOPS, no framebufferTexture shader : %d", texSamplerLoc); } else {