[Mesa-dev] [PATCH 07/15] glsl_to_tgsi: Remove st_new_shader_program
Ian Romanick
idr at freedesktop.org
Thu Oct 23 09:35:22 PDT 2014
From: Ian Romanick <ian.d.romanick at intel.com>
It was identical to the default implementation in
_mesa_new_shader_program.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Marek Olšák <marek.olsak at amd.com>
Cc: Dave Airlie <airlied at redhat.com>
---
src/mesa/state_tracker/st_cb_program.c | 1 -
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 12 ------------
src/mesa/state_tracker/st_glsl_to_tgsi.h | 3 ---
3 files changed, 16 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index 82e1fd1..9992bbb 100644
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -243,6 +243,5 @@ st_init_program_functions(struct dd_function_table *functions)
functions->ProgramStringNotify = st_program_string_notify;
functions->NewShader = st_new_shader;
- functions->NewShaderProgram = st_new_shader_program;
functions->LinkShader = st_link_shader;
}
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index a6ce033..b0cb171 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -5347,18 +5347,6 @@ st_new_shader(struct gl_context *ctx, GLuint name, GLuint type)
return shader;
}
-struct gl_shader_program *
-st_new_shader_program(struct gl_context *ctx, GLuint name)
-{
- struct gl_shader_program *shProg;
- shProg = rzalloc(NULL, struct gl_shader_program);
- if (shProg) {
- shProg->Name = name;
- _mesa_init_shader_program(ctx, shProg);
- }
- return shProg;
-}
-
/**
* Link a shader.
* Called via ctx->Driver.LinkShader()
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.h b/src/mesa/state_tracker/st_glsl_to_tgsi.h
index 18f666f..e3990d3 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.h
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.h
@@ -63,9 +63,6 @@ void get_bitmap_visitor(struct st_fragment_program *fp,
struct gl_shader *st_new_shader(struct gl_context *ctx, GLuint name, GLuint type);
-struct gl_shader_program *
-st_new_shader_program(struct gl_context *ctx, GLuint name);
-
GLboolean st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);
void
--
1.8.1.4
More information about the mesa-dev
mailing list