summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-09-27 21:28:22 +0200
committerMarek Olšák <[email protected]>2015-10-03 22:06:08 +0200
commit6863d5b02a5d982cc71cfc28155a8958adfc65d1 (patch)
treee0c40b102b07aec0709aa28e5ab123f4ec27d7c0 /src/mesa/main
parentb37dcb8c18ec28f1ba0c4f69c4b9680a5db9c2fe (diff)
mesa: remove Driver.DeleteShaderProgram
Nothing overrides it. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/dd.h2
-rw-r--r--src/mesa/main/shaderobj.c9
-rw-r--r--src/mesa/main/shaderobj.h3
-rw-r--r--src/mesa/main/shared.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 56cfda7091c..6873205375a 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -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);
/*@}*/
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 0b85f74bf42..4e85fda24b4 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -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;
}
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index f40c7fcc5e6..796de470735 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -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
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 7ab89d08584..1acaf59f432 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -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);
}
}