mesa: remove Driver.DeleteShaderProgram
Nothing overrides it. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
parent
b37dcb8c18
commit
6863d5b02a
|
@ -785,8 +785,6 @@ struct dd_function_table {
|
|||
/*@{*/
|
||||
struct gl_shader *(*NewShader)(struct gl_context *ctx,
|
||||
GLuint name, GLenum type);
|
||||
void (*DeleteShaderProgram)(struct gl_context *ctx,
|
||||
struct gl_shader_program *shProg);
|
||||
void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg);
|
||||
/*@}*/
|
||||
|
||||
|
|
|
@ -209,7 +209,7 @@ _mesa_reference_shader_program_(struct gl_context *ctx,
|
|||
if (deleteFlag) {
|
||||
if (old->Name != 0)
|
||||
_mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
|
||||
ctx->Driver.DeleteShaderProgram(ctx, old);
|
||||
_mesa_delete_shader_program(ctx, old);
|
||||
}
|
||||
|
||||
*ptr = NULL;
|
||||
|
@ -372,10 +372,10 @@ _mesa_free_shader_program_data(struct gl_context *ctx,
|
|||
|
||||
/**
|
||||
* Free/delete a shader program object.
|
||||
* Called via ctx->Driver.DeleteShaderProgram().
|
||||
*/
|
||||
static void
|
||||
_mesa_delete_shader_program(struct gl_context *ctx, struct gl_shader_program *shProg)
|
||||
void
|
||||
_mesa_delete_shader_program(struct gl_context *ctx,
|
||||
struct gl_shader_program *shProg)
|
||||
{
|
||||
_mesa_free_shader_program_data(ctx, shProg);
|
||||
|
||||
|
@ -437,6 +437,5 @@ void
|
|||
_mesa_init_shader_object_functions(struct dd_function_table *driver)
|
||||
{
|
||||
driver->NewShader = _mesa_new_shader;
|
||||
driver->DeleteShaderProgram = _mesa_delete_shader_program;
|
||||
driver->LinkShader = _mesa_ir_link_shader;
|
||||
}
|
||||
|
|
|
@ -102,6 +102,9 @@ extern void
|
|||
_mesa_free_shader_program_data(struct gl_context *ctx,
|
||||
struct gl_shader_program *shProg);
|
||||
|
||||
extern void
|
||||
_mesa_delete_shader_program(struct gl_context *ctx,
|
||||
struct gl_shader_program *shProg);
|
||||
|
||||
|
||||
extern void
|
||||
|
|
|
@ -224,7 +224,7 @@ delete_shader_cb(GLuint id, void *data, void *userData)
|
|||
else {
|
||||
struct gl_shader_program *shProg = (struct gl_shader_program *) data;
|
||||
assert(shProg->Type == GL_SHADER_PROGRAM_MESA);
|
||||
ctx->Driver.DeleteShaderProgram(ctx, shProg);
|
||||
_mesa_delete_shader_program(ctx, shProg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue