commit 294b061256220960e7e29fbc8ecbd2ffce75de40
author Brian Paul <brian.paul@tungstengraphics.com> Fri Jul 04 09:58:14 2008 -0600
committer Brian Paul <brian.paul@tungstengraphics.com> Fri Jul 04 10:02:43 2008 -0600
tree f2d68e42cb5cadcca70fdcbcfdcdd547fb15ada3
parent c4b6941e62f5e30a7c479b7b8d6521cc4dd92e3e

mesa: generate GL_INVALID_OPERATION in _mesa_get_uniform_location() if program isn't linked

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 3e28d92..182de37 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1011,6 +1011,11 @@
    if (!shProg)
       return -1;
 
+   if (shProg->LinkStatus == GL_FALSE) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
+      return -1;
+   }
+
    /* XXX we should return -1 if the uniform was declared, but not
     * actually used.
     */