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/program/ir_to_mesa.cpp | |
| 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/program/ir_to_mesa.cpp')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 652e7067d57..ddc4ab83364 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3306,8 +3306,8 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) linked_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); break; @@ -3428,7 +3428,6 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) } _mesa_reference_fragprog(ctx, &prog->FragmentProgram, NULL); - _mesa_reference_geomprog(ctx, &prog->GeometryProgram, NULL); if (prog->LinkStatus) { link_shaders(ctx, prog); |