summaryrefslogtreecommitdiffstats
path: root/src/mesa/program
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/program')
-rw-r--r--src/mesa/program/program.c5
-rw-r--r--src/mesa/program/program.h23
2 files changed, 1 insertions, 27 deletions
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index 85c9b7b1711..28af5b5f21b 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -223,10 +223,7 @@ _mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id)
struct gl_fragment_program *prog = CALLOC_STRUCT(gl_fragment_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
- case GL_GEOMETRY_PROGRAM_NV: {
- struct gl_geometry_program *prog = CALLOC_STRUCT(gl_geometry_program);
- return _mesa_init_gl_program(&prog->Base, target, id);
- }
+ case GL_GEOMETRY_PROGRAM_NV:
case GL_TESS_CONTROL_PROGRAM_NV:
case GL_TESS_EVALUATION_PROGRAM_NV: {
struct gl_program *prog = CALLOC_STRUCT(gl_program);
diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h
index 41806c218e4..a909dcc28d1 100644
--- a/src/mesa/program/program.h
+++ b/src/mesa/program/program.h
@@ -108,15 +108,6 @@ _mesa_reference_fragprog(struct gl_context *ctx,
}
static inline void
-_mesa_reference_geomprog(struct gl_context *ctx,
- struct gl_geometry_program **ptr,
- struct gl_geometry_program *prog)
-{
- _mesa_reference_program(ctx, (struct gl_program **) ptr,
- (struct gl_program *) prog);
-}
-
-static inline void
_mesa_reference_compprog(struct gl_context *ctx,
struct gl_compute_program **ptr,
struct gl_compute_program *prog)
@@ -222,20 +213,6 @@ gl_vertex_program_const(const struct gl_program *prog)
return (const struct gl_vertex_program *) prog;
}
-
-static inline struct gl_geometry_program *
-gl_geometry_program(struct gl_program *prog)
-{
- return (struct gl_geometry_program *) prog;
-}
-
-static inline const struct gl_geometry_program *
-gl_geometry_program_const(const struct gl_program *prog)
-{
- return (const struct gl_geometry_program *) prog;
-}
-
-
static inline struct gl_compute_program *
gl_compute_program(struct gl_program *prog)
{