Reviewed-by: Marek Olšák <[email protected]> Marek
On Thu, Oct 23, 2014 at 6:35 PM, Ian Romanick <[email protected]> wrote: > From: Ian Romanick <[email protected]> > > It was identical to the default implementation in _mesa_new_shader. > > Signed-off-by: Ian Romanick <[email protected]> > Cc: Marek Olšák <[email protected]> > Cc: Dave Airlie <[email protected]> > --- > src/mesa/state_tracker/st_cb_program.c | 1 - > src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 16 ---------------- > src/mesa/state_tracker/st_glsl_to_tgsi.h | 2 -- > 3 files changed, 19 deletions(-) > > diff --git a/src/mesa/state_tracker/st_cb_program.c > b/src/mesa/state_tracker/st_cb_program.c > index 9992bbb..faff9c4 100644 > --- a/src/mesa/state_tracker/st_cb_program.c > +++ b/src/mesa/state_tracker/st_cb_program.c > @@ -242,6 +242,5 @@ st_init_program_functions(struct dd_function_table > *functions) > functions->IsProgramNative = st_is_program_native; > functions->ProgramStringNotify = st_program_string_notify; > > - functions->NewShader = st_new_shader; > 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 b0cb171..a4e2c8d 100644 > --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp > +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp > @@ -5331,22 +5331,6 @@ get_mesa_program(struct gl_context *ctx, > > extern "C" { > > -struct gl_shader * > -st_new_shader(struct gl_context *ctx, GLuint name, GLuint type) > -{ > - struct gl_shader *shader; > - assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER || > - type == GL_GEOMETRY_SHADER_ARB); > - shader = rzalloc(NULL, struct gl_shader); > - if (shader) { > - shader->Type = type; > - shader->Stage = _mesa_shader_enum_to_shader_stage(type); > - shader->Name = name; > - _mesa_init_shader(ctx, shader); > - } > - return shader; > -} > - > /** > * 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 e3990d3..5ed6407 100644 > --- a/src/mesa/state_tracker/st_glsl_to_tgsi.h > +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.h > @@ -61,8 +61,6 @@ void get_bitmap_visitor(struct st_fragment_program *fp, > struct glsl_to_tgsi_visitor *original, > int samplerIndex); > > -struct gl_shader *st_new_shader(struct gl_context *ctx, GLuint name, GLuint > type); > - > GLboolean st_link_shader(struct gl_context *ctx, struct gl_shader_program > *prog); > > void > -- > 1.8.1.4 > > _______________________________________________ > mesa-dev mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
