diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-19 12:11:06 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-26 14:29:36 +1100 |
| commit | 9605b98a078654f6f76e85221599e5fa8c073de6 (patch) | |
| tree | e5b3666d491fa200674dee9a635684d721d4f84d /src/mesa/main/state.c | |
| parent | 5a228c0aae347ce68009f165427581e149611d65 (diff) | |
i965/mesa/st: eliminate gl_compute_program
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
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 b09b3fefec8..2f810b497b8 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -112,7 +112,7 @@ update_program(struct gl_context *ctx) 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; + const struct gl_program *prevCP = ctx->ComputeProgram._Current; GLbitfield new_state = 0x0; /* @@ -245,11 +245,11 @@ update_program(struct gl_context *ctx) if (csProg && csProg->LinkStatus && csProg->_LinkedShaders[MESA_SHADER_COMPUTE]) { /* Use GLSL compute shader */ - _mesa_reference_compprog(ctx, &ctx->ComputeProgram._Current, - gl_compute_program(csProg->_LinkedShaders[MESA_SHADER_COMPUTE]->Program)); + _mesa_reference_program(ctx, &ctx->ComputeProgram._Current, + csProg->_LinkedShaders[MESA_SHADER_COMPUTE]->Program); } else { /* no compute program */ - _mesa_reference_compprog(ctx, &ctx->ComputeProgram._Current, NULL); + _mesa_reference_program(ctx, &ctx->ComputeProgram._Current, NULL); } /* Let the driver know what's happening: @@ -298,7 +298,7 @@ update_program(struct gl_context *ctx) new_state |= _NEW_PROGRAM; if (ctx->Driver.BindProgram) { ctx->Driver.BindProgram(ctx, GL_COMPUTE_PROGRAM_NV, - (struct gl_program *) ctx->ComputeProgram._Current); + ctx->ComputeProgram._Current); } } |