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

mesa: Simplify validate_shader_program after previous refactors

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2011-08-20 16:05:43 -07:00
parent de772c4022
commit 5a4279f80d
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesa/main/shaderapi.c
View File

@@ -966,9 +966,7 @@ static GLboolean
validate_shader_program(const struct gl_shader_program *shProg, validate_shader_program(const struct gl_shader_program *shProg,
char *errMsg) char *errMsg)
{ {
const struct gl_shader *vs = shProg->_LinkedShaders[MESA_SHADER_VERTEX]; unsigned i;
const struct gl_shader *gs = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY];
const struct gl_shader *fs = shProg->_LinkedShaders[MESA_SHADER_FRAGMENT];
if (!shProg->LinkStatus) { if (!shProg->LinkStatus) {
return GL_FALSE; return GL_FALSE;
@@ -994,14 +992,11 @@ validate_shader_program(const struct gl_shader_program *shProg,
* Check: any two active samplers in the current program object are of * Check: any two active samplers in the current program object are of
* different types, but refer to the same texture image unit, * different types, but refer to the same texture image unit,
*/ */
if (vs && !validate_samplers(vs->Program, errMsg)) { for (i = 0; i < Elements(shProg->_LinkedShaders); i++) {
return GL_FALSE; if (shProg->_LinkedShaders[i]
} && !validate_samplers(shProg->_LinkedShaders[i]->Program, errMsg)) {
if (gs && !validate_samplers(gs->Program, errMsg)) { return GL_FALSE;
return GL_FALSE; }
}
if (fs && !validate_samplers(fs->Program, errMsg)) {
return GL_FALSE;
} }
return GL_TRUE; return GL_TRUE;