From a2dc16ed81e053eea9d74a6c0105ef1e4e3e0428 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 20 Oct 2014 15:26:42 -0700 Subject: [PATCH] i965: Remove brw_new_shader_program It was identical to the default implementation in _mesa_new_shader_program. Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_program.c | 1 - src/mesa/drivers/dri/i965/brw_shader.cpp | 11 ----------- src/mesa/drivers/dri/i965/brw_wm.h | 1 - 3 files changed, 13 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index b37da4ead62..e56ece0b3a8 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -237,7 +237,6 @@ void brwInitFragProgFuncs( struct dd_function_table *functions ) functions->ProgramStringNotify = brwProgramStringNotify; functions->NewShader = brw_new_shader; - functions->NewShaderProgram = brw_new_shader_program; functions->LinkShader = brw_link_shader; } diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 935514c5238..21dcf2da0e2 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -49,17 +49,6 @@ brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type) return &shader->base; } -struct gl_shader_program * -brw_new_shader_program(struct gl_context *ctx, GLuint name) -{ - struct gl_shader_program *prog = rzalloc(NULL, struct gl_shader_program); - if (prog) { - prog->Name = name; - _mesa_init_shader_program(ctx, prog); - } - return prog; -} - /** * Performs a compile of the shader stages even when we don't know * what non-orthogonal state will be set, in the hope that it reflects diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h index 77a364449ad..0e0039be784 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.h +++ b/src/mesa/drivers/dri/i965/brw_wm.h @@ -96,7 +96,6 @@ const unsigned *brw_wm_fs_emit(struct brw_context *brw, GLboolean brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog); struct gl_shader *brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type); -struct gl_shader_program *brw_new_shader_program(struct gl_context *ctx, GLuint name); bool brw_color_buffer_write_enabled(struct brw_context *brw); bool do_wm_prog(struct brw_context *brw, -- 2.30.2