summaryrefslogtreecommitdiff
path: root/progs/glsl
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-08-12 13:53:56 -0600
committerBrian Paul <brianp@vmware.com>2009-08-12 17:28:45 -0600
commit684049d97d423a5a873aefc5313d0c4b22528b95 (patch)
tree2971be3a76aa280a053801ea5f7b63f0af324824 /progs/glsl
parent378bff0eddf004d131a4c83194fb3e83492c4c37 (diff)
demos: rename InitUniforms() to SetUniformValues()
And call new PrintUniforms() in demos.
Diffstat (limited to 'progs/glsl')
-rw-r--r--progs/glsl/brick.c3
-rw-r--r--progs/glsl/bump.c3
-rw-r--r--progs/glsl/mandelbrot.c3
-rw-r--r--progs/glsl/multitex.c3
-rw-r--r--progs/glsl/noise.c3
-rw-r--r--progs/glsl/texdemo1.c3
-rw-r--r--progs/glsl/toyball.c3
7 files changed, 14 insertions, 7 deletions
diff --git a/progs/glsl/brick.c b/progs/glsl/brick.c
index 1d08b231e7..e5f5c96607 100644
--- 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 ddb986abcb..29af26f7a1 100644
--- 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 38dffc3e74..09c65d2c2b 100644
--- 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 a4a8bbe38f..ce79bc1b4d 100644
--- 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 59f594e78b..6ef2a80f78 100644
--- 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 d55f9e7dd9..f0dce8555e 100644
--- 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 7fe27aebfe..13f5776684 100644
--- 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);