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/state.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/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 80502e59af7..bbe90a32e08 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -246,10 +246,12 @@ update_program(struct gl_context *ctx) * come up, or matter. */ - if (fsProg && fsProg->LinkStatus && fsProg->FragmentProgram) { + if (fsProg && fsProg->LinkStatus + && fsProg->_LinkedShaders[MESA_SHADER_FRAGMENT]) { /* Use GLSL fragment shader */ _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, - fsProg->FragmentProgram); + (struct gl_fragment_program *) + fsProg->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program); } else if (ctx->FragmentProgram._Enabled) { /* Use user-defined fragment program */ |