diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 11:59:12 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 92f77e9c01085c6babe6ce80dfe4e0e7abab61a1 (patch) | |
| tree | ecea28bd6506ea75c1e980ea688f684a97822226 /src/mesa/main/state.c | |
| parent | 9045ddcfe4ed2ecc6220db69dc33d6049956b99b (diff) | |
i965/mesa/st: eliminate gl_geometry_program
We now get all the gs metadata from shader_info.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 10194a9f5ca..407ff385482 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -109,7 +109,7 @@ update_program(struct gl_context *ctx) ctx->_Shader->CurrentProgram[MESA_SHADER_COMPUTE]; const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current; const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current; - const struct gl_geometry_program *prevGP = ctx->GeometryProgram._Current; + const struct gl_program *prevGP = ctx->GeometryProgram._Current; const struct gl_program *prevTCP = ctx->TessCtrlProgram._Current; const struct gl_program *prevTEP = ctx->TessEvalProgram._Current; const struct gl_compute_program *prevCP = ctx->ComputeProgram._Current; @@ -186,11 +186,11 @@ update_program(struct gl_context *ctx) if (gsProg && gsProg->LinkStatus && gsProg->_LinkedShaders[MESA_SHADER_GEOMETRY]) { /* Use GLSL geometry shader */ - _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, - gl_geometry_program(gsProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program)); + _mesa_reference_program(ctx, &ctx->GeometryProgram._Current, + gsProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program); } else { /* No geometry program */ - _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL); + _mesa_reference_program(ctx, &ctx->GeometryProgram._Current, NULL); } if (tesProg && tesProg->LinkStatus @@ -266,7 +266,7 @@ update_program(struct gl_context *ctx) new_state |= _NEW_PROGRAM; if (ctx->Driver.BindProgram) { ctx->Driver.BindProgram(ctx, GL_GEOMETRY_PROGRAM_NV, - (struct gl_program *) ctx->GeometryProgram._Current); + ctx->GeometryProgram._Current); } } |