From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 10 Apr 2008 04:29:33 +0000 (-0600)
Subject: use InitUniforms()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26f0b8f5068bcaa8269030c86e0ab493bdc9f2e8;p=mesa.git

use InitUniforms()
---

diff --git a/progs/glsl/mandelbrot.c b/progs/glsl/mandelbrot.c
index a15aad981cb..fa67a3c2cae 100644
--- a/progs/glsl/mandelbrot.c
+++ b/progs/glsl/mandelbrot.c
@@ -154,8 +154,6 @@ SpecialKey(int key, int x, int y)
 static void
 Init(void)
 {
-   GLint i;
-
    if (!ShadersSupported())
       exit(1);
 
@@ -167,28 +165,7 @@ Init(void)
 
    glUseProgram_func(program);
 
-   for (i = 0; Uniforms[i].name; i++) {
-      Uniforms[i].location
-         = glGetUniformLocation_func(program, Uniforms[i].name);
-      printf("Uniform %s location: %d\n", Uniforms[i].name,
-             Uniforms[i].location);
-      switch (Uniforms[i].size) {
-      case 1:
-         glUniform1fv_func(Uniforms[i].location, 1, Uniforms[i].value);
-         break;
-      case 2:
-         glUniform2fv_func(Uniforms[i].location, 1, Uniforms[i].value);
-         break;
-      case 3:
-         glUniform3fv_func(Uniforms[i].location, 1, Uniforms[i].value);
-         break;
-      case 4:
-         glUniform4fv_func(Uniforms[i].location, 1, Uniforms[i].value);
-         break;
-      default:
-         abort();
-      }
-   }
+   InitUniforms(program, Uniforms);
 
    uZoom = glGetUniformLocation_func(program, "Zoom");
    uXcenter = glGetUniformLocation_func(program, "Xcenter");