1 files changed, 8 insertions, 1 deletions
diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 233252112a..489e71cc30 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();
+         }
       }
    }
 }