diff options
author | José Fonseca <jfonseca@vmware.com> | 2011-08-01 13:17:43 +0100 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2011-08-01 13:19:21 +0100 |
commit | 606882b68bf3a9c7a9e89739d00bde014f34ebb2 (patch) | |
tree | 5076ad4afdd849e3a13380a9199950510fe5d5f7 | |
parent | e980752741cb2347b4a287c829bb27a6a2b4f0d3 (diff) |
multitex: Uniforms must be set after linking the program.
This fixes the program when replacing gl_Vertex with VertCoord in
multitex.vert, and VertCoord happens to not receive location 0.
-rw-r--r-- | src/glsl/multitex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c index d0d5ffd7..262ea50f 100644 --- a/src/glsl/multitex.c +++ b/src/glsl/multitex.c @@ -328,9 +328,6 @@ CreateAProgram(const char *vertProgFile, const char *fragProgFile, glUseProgram(program); - SetUniformValues(program, uniforms); - PrintUniforms(Uniforms); - assert(ValidateShaderProgram(program)); VertCoord_attr = glGetAttribLocation(program, "VertCoord"); @@ -355,6 +352,9 @@ CreateAProgram(const char *vertProgFile, const char *fragProgFile, printf("TexCoord1_attr = %d\n", TexCoord1_attr); printf("VertCoord_attr = %d\n", VertCoord_attr); + SetUniformValues(program, uniforms); + PrintUniforms(Uniforms); + return program; } |