diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 11:13:52 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 64d9773cfebded42691a70e3b233cadf896e53ba (patch) | |
| tree | 5723116394eb77c64c8bb52459540131ec1ab38f /src/mesa/program | |
| parent | 750b14ed8e6ff539f17069dec63004159575ccd8 (diff) | |
i965/mesa/st: eliminate gl_tess_ctrl_program
We now get all the tcs metadata from shader_info.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/prog_statevars.c | 2 | ||||
| -rw-r--r-- | src/mesa/program/program.c | 4 | ||||
| -rw-r--r-- | src/mesa/program/program.h | 23 |
3 files changed, 3 insertions, 26 deletions
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index 86bbd0ac663..2ac7b561b69 100644 --- a/src/mesa/program/prog_statevars.c +++ b/src/mesa/program/prog_statevars.c @@ -604,7 +604,7 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[], case STATE_TES_PATCH_VERTICES_IN: if (ctx->TessCtrlProgram._Current) - val[0].i = ctx->TessCtrlProgram._Current->Base.info.tcs.vertices_out; + val[0].i = ctx->TessCtrlProgram._Current->info.tcs.vertices_out; else val[0].i = ctx->TessCtrlProgram.patch_vertices; return; diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 67672164f59..f89a833d202 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -228,8 +228,8 @@ _mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id) return _mesa_init_gl_program(&prog->Base, target, id); } case GL_TESS_CONTROL_PROGRAM_NV: { - struct gl_tess_ctrl_program *prog = CALLOC_STRUCT(gl_tess_ctrl_program); - return _mesa_init_gl_program(&prog->Base, target, id); + struct gl_program *prog = CALLOC_STRUCT(gl_program); + return _mesa_init_gl_program(prog, target, id); } case GL_TESS_EVALUATION_PROGRAM_NV: { struct gl_tess_eval_program *prog = CALLOC_STRUCT(gl_tess_eval_program); diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h index 09e69280d46..d937f826697 100644 --- a/src/mesa/program/program.h +++ b/src/mesa/program/program.h @@ -125,16 +125,6 @@ _mesa_reference_compprog(struct gl_context *ctx, (struct gl_program *) prog); } - -static inline void -_mesa_reference_tesscprog(struct gl_context *ctx, - struct gl_tess_ctrl_program **ptr, - struct gl_tess_ctrl_program *prog) -{ - _mesa_reference_program(ctx, (struct gl_program **) ptr, - (struct gl_program *) prog); -} - static inline void _mesa_reference_tesseprog(struct gl_context *ctx, struct gl_tess_eval_program **ptr, @@ -267,19 +257,6 @@ gl_compute_program_const(const struct gl_program *prog) return (const struct gl_compute_program *) prog; } -static inline struct gl_tess_ctrl_program * -gl_tess_ctrl_program(struct gl_program *prog) -{ - return (struct gl_tess_ctrl_program *) prog; -} - -static inline const struct gl_tess_ctrl_program * -gl_tess_ctrl_program_const(const struct gl_program *prog) -{ - return (const struct gl_tess_ctrl_program *) prog; -} - - static inline struct gl_tess_eval_program * gl_tess_eval_program(struct gl_program *prog) { |