diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 10:30:52 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 67c2d80a839614e4638d6cff390627122f8148ca (patch) | |
| tree | fc6e4bd791478b11338cee1028bd77f0196c970c /src/mesa/program | |
| parent | 65225c20c64dd5980f4e3a4eaecb9088aabea2fb (diff) | |
i965/mesa/st: eliminate gl_tess_eval_program
We now get all the tes metadata from shader_info.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/program.c | 7 | ||||
| -rw-r--r-- | src/mesa/program/program.h | 22 |
2 files changed, 2 insertions, 27 deletions
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index f89a833d202..85c9b7b1711 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -227,14 +227,11 @@ _mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id) struct gl_geometry_program *prog = CALLOC_STRUCT(gl_geometry_program); return _mesa_init_gl_program(&prog->Base, target, id); } - case GL_TESS_CONTROL_PROGRAM_NV: { + case GL_TESS_CONTROL_PROGRAM_NV: + case GL_TESS_EVALUATION_PROGRAM_NV: { 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); - return _mesa_init_gl_program(&prog->Base, target, id); - } case GL_COMPUTE_PROGRAM_NV: { struct gl_compute_program *prog = CALLOC_STRUCT(gl_compute_program); return _mesa_init_gl_program(&prog->Base, target, id); diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h index d937f826697..41806c218e4 100644 --- a/src/mesa/program/program.h +++ b/src/mesa/program/program.h @@ -125,15 +125,6 @@ _mesa_reference_compprog(struct gl_context *ctx, (struct gl_program *) prog); } -static inline void -_mesa_reference_tesseprog(struct gl_context *ctx, - struct gl_tess_eval_program **ptr, - struct gl_tess_eval_program *prog) -{ - _mesa_reference_program(ctx, (struct gl_program **) ptr, - (struct gl_program *) prog); -} - extern GLboolean _mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count); @@ -257,19 +248,6 @@ gl_compute_program_const(const struct gl_program *prog) return (const struct gl_compute_program *) prog; } -static inline struct gl_tess_eval_program * -gl_tess_eval_program(struct gl_program *prog) -{ - return (struct gl_tess_eval_program *) prog; -} - -static inline const struct gl_tess_eval_program * -gl_tess_eval_program_const(const struct gl_program *prog) -{ - return (const struct gl_tess_eval_program *) prog; -} - - #ifdef __cplusplus } /* extern "C" */ #endif |