diff options
| author | Ian Romanick <[email protected]> | 2011-08-20 15:00:36 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-10-07 16:39:50 -0700 |
| commit | de772c402215b956ab3aa0875330fc1bf7cdf95b (patch) | |
| tree | 218fb8b814d144ceccb08a0f7ebe6640fa8bf675 /src/mesa/main/shaderapi.c | |
| parent | 39348bf79fb247eec895c93e52f23afe138be46a (diff) | |
mesa: Use gl_shader_program::_LinkedShaders instead of FragmentProgram
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/shaderapi.c')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index c70fda1e205..1583520391d 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -811,8 +811,9 @@ print_shader_info(const struct gl_shader_program *shProg) if (shProg->_LinkedShaders[MESA_SHADER_VERTEX]) printf(" vert prog %u\n", shProg->_LinkedShaders[MESA_SHADER_VERTEX]->Program->Id); - if (shProg->FragmentProgram) - printf(" frag prog %u\n", shProg->FragmentProgram->Base.Id); + if (shProg->_LinkedShaders[MESA_SHADER_FRAGMENT]) + printf(" frag prog %u\n", + shProg->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program->Id); if (shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]) printf(" geom prog %u\n", shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program->Id); @@ -967,7 +968,7 @@ validate_shader_program(const struct gl_shader_program *shProg, { const struct gl_shader *vs = shProg->_LinkedShaders[MESA_SHADER_VERTEX]; const struct gl_shader *gs = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]; - const struct gl_fragment_program *fp = shProg->FragmentProgram; + const struct gl_shader *fs = shProg->_LinkedShaders[MESA_SHADER_FRAGMENT]; if (!shProg->LinkStatus) { return GL_FALSE; @@ -999,7 +1000,7 @@ validate_shader_program(const struct gl_shader_program *shProg, if (gs && !validate_samplers(gs->Program, errMsg)) { return GL_FALSE; } - if (fp && !validate_samplers(&fp->Base, errMsg)) { + if (fs && !validate_samplers(fs->Program, errMsg)) { return GL_FALSE; } |