program: remove _mesa_init_*_program wrappers

They didn't do anything useful.

Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Brian Paul <[email protected]>

1 files changed, 18 insertions, 25 deletions

diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index 003ce336fd4..40f2af0e550 100644
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -102,36 +102,29 @@ st_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)
 static struct gl_program *
 st_new_program(struct gl_context *ctx, GLenum target, GLuint id)
 {
-   switch (target) {
-   case GL_VERTEX_PROGRAM_ARB: {
-      struct st_vertex_program *prog = ST_CALLOC_STRUCT(st_vertex_program);
-      return _mesa_init_vertex_program(ctx, &prog->Base, target, id);
-   }
-
-   case GL_FRAGMENT_PROGRAM_ARB: {
-      struct st_fragment_program *prog = ST_CALLOC_STRUCT(st_fragment_program);
-      return _mesa_init_fragment_program(ctx, &prog->Base, target, id);
-   }
-
-   case GL_GEOMETRY_PROGRAM_NV: {
-      struct st_geometry_program *prog = ST_CALLOC_STRUCT(st_geometry_program);
-      return _mesa_init_geometry_program(ctx, &prog->Base, target, id);
-   }
-
-   case GL_TESS_CONTROL_PROGRAM_NV: {
-      struct st_tessctrl_program *prog = ST_CALLOC_STRUCT(st_tessctrl_program);
-      return _mesa_init_tess_ctrl_program(ctx, &prog->Base, target, id);
-   }
-
-   case GL_TESS_EVALUATION_PROGRAM_NV: {
-      struct st_tesseval_program *prog = ST_CALLOC_STRUCT(st_tesseval_program);
-      return _mesa_init_tess_eval_program(ctx, &prog->Base, target, id);
-   }
+   struct gl_program *prog;
 
+   switch (target) {
+   case GL_VERTEX_PROGRAM_ARB:
+      prog = (struct gl_program*)ST_CALLOC_STRUCT(st_vertex_program);
+      break;
+   case GL_FRAGMENT_PROGRAM_ARB:
+      prog = (struct gl_program*)ST_CALLOC_STRUCT(st_fragment_program);
+      break;
+   case GL_GEOMETRY_PROGRAM_NV:
+      prog = (struct gl_program*)ST_CALLOC_STRUCT(st_geometry_program);
+      break;
+   case GL_TESS_CONTROL_PROGRAM_NV:
+      prog = (struct gl_program*)ST_CALLOC_STRUCT(st_tessctrl_program);
+      break;
+   case GL_TESS_EVALUATION_PROGRAM_NV:
+      prog = (struct gl_program*)ST_CALLOC_STRUCT(st_tesseval_program);
+      break;
    default:
       assert(0);
       return NULL;
    }
+   return _mesa_init_gl_program(prog, target, id);
 }