OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demos: rename InitUniforms() to SetUniformValues()

Browse Source 
And call new PrintUniforms() in demos.
This commit is contained in:
Brian Paul
2009-08-12 13:53:56 -06:00
parent 378bff0edd
commit 684049d97d
9 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
progs/glsl/brick.c
View File

@@ -148,7 +148,8 @@ Init(void)
glUseProgram(program); glUseProgram(program);
InitUniforms(program, Uniforms); SetUniformValues(program, Uniforms);
PrintUniforms(Uniforms);
assert(glGetError() == 0); assert(glGetError() == 0);

3
progs/glsl/bump.c
View File

@@ -242,7 +242,8 @@ Init(void)
CheckError(__LINE__); CheckError(__LINE__);
InitUniforms(program, Uniforms); SetUniformValues(program, Uniforms);
PrintUniforms(Uniforms);
CheckError(__LINE__); CheckError(__LINE__);

3
progs/glsl/mandelbrot.c
View File

@@ -159,7 +159,8 @@ Init(void)
glUseProgram(program); glUseProgram(program);
InitUniforms(program, Uniforms); SetUniformValues(program, Uniforms);
PrintUniforms(Uniforms);
uZoom = glGetUniformLocation(program, "Zoom"); uZoom = glGetUniformLocation(program, "Zoom");
uXcenter = glGetUniformLocation(program, "Xcenter"); uXcenter = glGetUniformLocation(program, "Xcenter");

3
progs/glsl/multitex.c
View File

@@ -328,7 +328,8 @@ CreateProgram(const char *vertProgFile, const char *fragProgFile,
glUseProgram(program); glUseProgram(program);
InitUniforms(program, uniforms); SetUniformValues(program, uniforms);
PrintUniforms(Uniforms);
VertCoord_attr = glGetAttribLocation(program, "VertCoord"); VertCoord_attr = glGetAttribLocation(program, "VertCoord");
if (VertCoord_attr > 0) { if (VertCoord_attr > 0) {

3
progs/glsl/noise.c
View File

@@ -179,7 +179,8 @@ Init(void)
glUseProgram(program); glUseProgram(program);
InitUniforms(program, Uniforms); SetUniformValues(program, Uniforms);
PrintUniforms(Uniforms);
assert(glGetError() == 0); assert(glGetError() == 0);

3
progs/glsl/texdemo1.c
View File

@@ -382,7 +382,8 @@ CreateProgram(const char *vertProgFile, const char *fragProgFile,
glUseProgram(program); glUseProgram(program);
InitUniforms(program, uniforms); SetUniformValues(program, uniforms);
PrintUniforms(uniforms);
return program; return program;
} }

3
progs/glsl/toyball.c
View File

@@ -173,7 +173,8 @@ Init(void)
glUseProgram(program); glUseProgram(program);
InitUniforms(program, Uniforms); SetUniformValues(program, Uniforms);
PrintUniforms(Uniforms);
assert(glGetError() == 0); assert(glGetError() == 0);

2
progs/util/shaderutil.c
View File

@@ -122,7 +122,7 @@ LinkShaders(GLuint vertShader, GLuint fragShader)
void void
InitUniforms(GLuint program, struct uniform_info uniforms[]) SetUniformValues(GLuint program, struct uniform_info uniforms[])
{ {
GLuint i; GLuint i;

2
progs/util/shaderutil.h
View File

@@ -37,7 +37,7 @@ extern GLuint
LinkShaders(GLuint vertShader, GLuint fragShader); LinkShaders(GLuint vertShader, GLuint fragShader);
extern void extern void
InitUniforms(GLuint program, struct uniform_info uniforms[]); SetUniformValues(GLuint program, struct uniform_info uniforms[]);
extern GLuint extern GLuint
GetUniforms(GLuint program, struct uniform_info uniforms[]); GetUniforms(GLuint program, struct uniform_info uniforms[]);