Mesa (master): progs/util: ignore pre-defined uniforms in SetUniformValues( )

[Brian Paul]

Module: Mesa
Branch: master
Commit: 741869d73aa8c9d0d9ae8f1c4ca2df32e235960a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=741869d73aa8c9d0d9ae8f1c4ca2df32e235960a

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Aug 13 12:53:20 2009 -0600

progs/util: ignore pre-defined uniforms in SetUniformValues()

---

 progs/util/shaderutil.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 2332521..489e71c 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -153,7 +153,14 @@ SetUniformValues(GLuint program, struct uniform_info uniforms[])
          glUniform4fv(uniforms[i].location, 1, uniforms[i].value);
          break;
       default:
-         abort();
+         if (strncmp(uniforms[i].name, "gl_", 3) == 0) {
+            /* built-in uniform: ignore */
+         }
+         else {
+            fprintf(stderr,
+                    "Unexpected uniform data type in SetUniformValues\n");
+            abort();
+         }
       }
    }
 }