KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

progs/util: added ValidateShaderProgram() to shaderutil.c

This commit is contained in:
Brian Paul 2009-08-25 17:36:28 -06:00
parent b7d2023cf9
commit fa6299cb31
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
progs/util/shaderutil.c
View File

@ -140,6 +140,25 @@ LinkShaders(GLuint vertShader, GLuint fragShader)
}
GLboolean
ValidateShaderProgram(GLuint program)
{
GLint stat;
glValidateProgramARB(program);
glGetProgramiv(program, GL_VALIDATE_STATUS, &stat);
if (!stat) {
GLchar log[1000];
GLsizei len;
glGetProgramInfoLog(program, 1000, &len, log);
fprintf(stderr, "Program validation error:\n%s\n", log);
return 0;
}
return (GLboolean) stat;
}
GLdouble
GetShaderCompileTime(void)
{
@ -170,6 +189,7 @@ SetUniformValues(GLuint program, struct uniform_info uniforms[])
case GL_SAMPLER_3D:
case GL_SAMPLER_CUBE:
case GL_SAMPLER_2D_RECT_ARB:
assert(uniforms[i].value[0] >= 0.0F);
glUniform1i(uniforms[i].location,
(GLint) uniforms[i].value[0]);
break;

3
progs/util/shaderutil.h
View File

@ -36,6 +36,9 @@ CompileShaderFile(GLenum shaderType, const char *filename);
extern GLuint
LinkShaders(GLuint vertShader, GLuint fragShader);
extern GLboolean
ValidateShaderProgram(GLuint program);
extern GLdouble
GetShaderCompileTime(void);