diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-12 13:53:56 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-12 17:28:45 -0600 |
| commit | 684049d97d423a5a873aefc5313d0c4b22528b95 (patch) | |
| tree | 2971be3a76aa280a053801ea5f7b63f0af324824 /progs | |
| parent | 378bff0eddf004d131a4c83194fb3e83492c4c37 (diff) | |
| download | external_mesa3d-684049d97d423a5a873aefc5313d0c4b22528b95.zip external_mesa3d-684049d97d423a5a873aefc5313d0c4b22528b95.tar.gz external_mesa3d-684049d97d423a5a873aefc5313d0c4b22528b95.tar.bz2 | |
demos: rename InitUniforms() to SetUniformValues()
And call new PrintUniforms() in demos.
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/glsl/brick.c | 3 | ||||
| -rw-r--r-- | progs/glsl/bump.c | 3 | ||||
| -rw-r--r-- | progs/glsl/mandelbrot.c | 3 | ||||
| -rw-r--r-- | progs/glsl/multitex.c | 3 | ||||
| -rw-r--r-- | progs/glsl/noise.c | 3 | ||||
| -rw-r--r-- | progs/glsl/texdemo1.c | 3 | ||||
| -rw-r--r-- | progs/glsl/toyball.c | 3 | ||||
| -rw-r--r-- | progs/util/shaderutil.c | 2 | ||||
| -rw-r--r-- | progs/util/shaderutil.h | 2 |
9 files changed, 16 insertions, 9 deletions
diff --git a/progs/glsl/brick.c b/progs/glsl/brick.c index 1d08b23..e5f5c96 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 ddb986a..29af26f 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 38dffc3..09c65d2 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 a4a8bbe..ce79bc1 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 59f594e..6ef2a80 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 d55f9e7..f0dce85 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 7fe27ae..13f5776 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); diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c index bd04ce5..f057adf 100644 --- 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 607ed28..22dc4dc 100644 --- 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[]); |