diff options
| author | Ian Romanick <[email protected]> | 2011-08-20 14:26:12 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-10-07 16:39:50 -0700 |
| commit | 39348bf79fb247eec895c93e52f23afe138be46a (patch) | |
| tree | ab54c146078a569e77bca80eec86fe251edc42bb /src/mesa/state_tracker | |
| parent | 010cc547ca8c1fb2107106b0ad0de560780ce9aa (diff) | |
mesa: Use gl_shader_program::_LinkedShaders instead of GeometryProgram
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_program.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 01e4d88baf7..56bc7f8fac5 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -5202,8 +5202,8 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) } break; case GL_GEOMETRY_SHADER: - _mesa_reference_geomprog(ctx, &prog->GeometryProgram, - (struct gl_geometry_program *)linked_prog); + _mesa_reference_program(ctx, &prog->_LinkedShaders[i]->Program, + linked_prog); ok = ctx->Driver.ProgramStringNotify(ctx, GL_GEOMETRY_PROGRAM_NV, linked_prog); if (!ok) { diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 5211043de04..ba9980854d0 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1157,8 +1157,8 @@ destroy_shader_program_variants_cb(GLuint key, void *data, void *userData) shProg->_LinkedShaders[MESA_SHADER_VERTEX]->Program); destroy_program_variants(st, (struct gl_program *) shProg->FragmentProgram); - destroy_program_variants(st, (struct gl_program *) - shProg->GeometryProgram); + destroy_program_variants(st, + shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program); } break; case GL_VERTEX_SHADER: |