diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 12:11:06 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 9605b98a078654f6f76e85221599e5fa8c073de6 (patch) | |
| tree | e5b3666d491fa200674dee9a635684d721d4f84d /src/mesa/program | |
| parent | 5a228c0aae347ce68009f165427581e149611d65 (diff) | |
i965/mesa/st: eliminate gl_compute_program
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 | 21 |
2 files changed, 2 insertions, 26 deletions
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index a72e6a11dbd..61cc6fe9e96 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -222,14 +222,11 @@ _mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id) case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */ case GL_GEOMETRY_PROGRAM_NV: case GL_TESS_CONTROL_PROGRAM_NV: - case GL_TESS_EVALUATION_PROGRAM_NV: { + case GL_TESS_EVALUATION_PROGRAM_NV: + case GL_COMPUTE_PROGRAM_NV: { struct gl_program *prog = CALLOC_STRUCT(gl_program); return _mesa_init_gl_program(prog, 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); - } default: _mesa_problem(ctx, "bad target in _mesa_new_program"); return NULL; diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h index 5f322da85a6..defeb2f2a0f 100644 --- a/src/mesa/program/program.h +++ b/src/mesa/program/program.h @@ -98,15 +98,6 @@ _mesa_reference_fragprog(struct gl_context *ctx, (struct gl_program *) prog); } -static inline void -_mesa_reference_compprog(struct gl_context *ctx, - struct gl_compute_program **ptr, - struct gl_compute_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); @@ -187,18 +178,6 @@ gl_fragment_program_const(const struct gl_program *prog) return (const struct gl_fragment_program *) prog; } -static inline struct gl_compute_program * -gl_compute_program(struct gl_program *prog) -{ - return (struct gl_compute_program *) prog; -} - -static inline const struct gl_compute_program * -gl_compute_program_const(const struct gl_program *prog) -{ - return (const struct gl_compute_program *) prog; -} - #ifdef __cplusplus } /* extern "C" */ #endif |