demos: rename InitUniforms() to SetUniformValues()

And call new PrintUniforms() in demos.

diff --git a/progs/glsl/brick.c b/progs/glsl/brick.c
index 1d08b231e7e45e32570d6752159ccb62322a09ab..e5f5c96607dff47204602a9ec31156cac77bc019 100644 (file)
--- a/progs/glsl/brick.c
+++ b/progs/glsl/brick.c
@@ -148,7 +148,8 @@ Init(void)
 
    glUseProgram(program);
 
-   InitUniforms(program, Uniforms);
+   SetUniformValues(program, Uniforms);
+   PrintUniforms(Uniforms);
 
    assert(glGetError() == 0);
 

diff --git a/progs/glsl/bump.c b/progs/glsl/bump.c
index ddb986abcb54e9924abbbd7364cb32a1d7fd785d..29af26f7a1f10d4dc437cad0e10fcd460c2f8f1e 100644 (file)
--- a/progs/glsl/bump.c
+++ b/progs/glsl/bump.c
@@ -242,7 +242,8 @@ Init(void)
 
    CheckError(__LINE__);
 
-   InitUniforms(program, Uniforms);
+   SetUniformValues(program, Uniforms);
+   PrintUniforms(Uniforms);
 
    CheckError(__LINE__);
 

diff --git a/progs/glsl/mandelbrot.c b/progs/glsl/mandelbrot.c
index 38dffc3e741cbe84eea209b98ae6dca5e0ed9ea4..09c65d2c2b72f4f64a93454c348a27d56fa8846b 100644 (file)
--- a/progs/glsl/mandelbrot.c
+++ b/progs/glsl/mandelbrot.c
@@ -159,7 +159,8 @@ Init(void)
 
    glUseProgram(program);
 
-   InitUniforms(program, Uniforms);
+   SetUniformValues(program, Uniforms);
+   PrintUniforms(Uniforms);
 
    uZoom = glGetUniformLocation(program, "Zoom");
    uXcenter = glGetUniformLocation(program, "Xcenter");

diff --git a/progs/glsl/multitex.c b/progs/glsl/multitex.c
index a4a8bbe38fa267683ef78be4172cee3302c90376..ce79bc1b4d552d27e5c140d173c4aa57a3bb57f7 100644 (file)
--- a/progs/glsl/multitex.c
+++ b/progs/glsl/multitex.c
@@ -328,7 +328,8 @@ CreateProgram(const char *vertProgFile, const char *fragProgFile,
 
    glUseProgram(program);
 
-   InitUniforms(program, uniforms);
+   SetUniformValues(program, uniforms);
+   PrintUniforms(Uniforms);
 
    VertCoord_attr = glGetAttribLocation(program, "VertCoord");
    if (VertCoord_attr > 0) {

diff --git a/progs/glsl/noise.c b/progs/glsl/noise.c
index 59f594e78bf3050da7e4292a2f5d73066c4c9283..6ef2a80f78d5e31c5bfdad26017c9f649f69dba2 100644 (file)
--- a/progs/glsl/noise.c
+++ b/progs/glsl/noise.c
@@ -179,7 +179,8 @@ Init(void)
 
    glUseProgram(program);
 
-   InitUniforms(program, Uniforms);
+   SetUniformValues(program, Uniforms);
+   PrintUniforms(Uniforms);
 
    assert(glGetError() == 0);
 

diff --git a/progs/glsl/texdemo1.c b/progs/glsl/texdemo1.c
index d55f9e7dd97ac156adb745713ba49da054cb6b0c..f0dce8555e7da67a58ec25107e2c8c5d85e36fe3 100644 (file)
--- a/progs/glsl/texdemo1.c
+++ b/progs/glsl/texdemo1.c
@@ -382,7 +382,8 @@ CreateProgram(const char *vertProgFile, const char *fragProgFile,
 
    glUseProgram(program);
 
-   InitUniforms(program, uniforms);
+   SetUniformValues(program, uniforms);
+   PrintUniforms(uniforms);
 
    return program;
 }

diff --git a/progs/glsl/toyball.c b/progs/glsl/toyball.c
index 7fe27aebfe64d01f7bc635ba279408d0353a762b..13f57766844e2efc7efc52fcd8be999a6c2767cb 100644 (file)
--- a/progs/glsl/toyball.c
+++ b/progs/glsl/toyball.c
@@ -173,7 +173,8 @@ Init(void)
 
    glUseProgram(program);
 
-   InitUniforms(program, Uniforms);
+   SetUniformValues(program, Uniforms);
+   PrintUniforms(Uniforms);
 
    assert(glGetError() == 0);
 

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index bd04ce5c6ad9fbdfb416f4d3cd36d18f1c28cc90..f057adf5c73476ec7ac31c5a393a1da003ae66fc 100644 (file)
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -122,7 +122,7 @@ LinkShaders(GLuint vertShader, GLuint fragShader)
 
 
 void
-InitUniforms(GLuint program, struct uniform_info uniforms[])
+SetUniformValues(GLuint program, struct uniform_info uniforms[])
 {
    GLuint i;
 

diff --git a/progs/util/shaderutil.h b/progs/util/shaderutil.h
index 607ed284915713708ef47f94a52aaa49b348a796..22dc4dc4319f5b847f5ced97655d6a60785b22d7 100644 (file)
--- a/progs/util/shaderutil.h
+++ b/progs/util/shaderutil.h
@@ -37,7 +37,7 @@ extern GLuint
 LinkShaders(GLuint vertShader, GLuint fragShader);
 
 extern void
-InitUniforms(GLuint program, struct uniform_info uniforms[]);
+SetUniformValues(GLuint program, struct uniform_info uniforms[]);
 
 extern GLuint
 GetUniforms(GLuint program, struct uniform_info uniforms[]);