diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-09-27 21:28:22 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-10-03 22:06:08 +0200 |
| commit | 95e03033127f9b93b49301adbf5d4b6ddccfa931 (patch) | |
| tree | 6ed2ef74a7b9b084052618a0869aeb5b82d05449 /src/mesa/main/shaderobj.c | |
| parent | 18123a732b8593bb7add03d1529ace464f46a7ac (diff) | |
| download | external_mesa3d-95e03033127f9b93b49301adbf5d4b6ddccfa931.zip external_mesa3d-95e03033127f9b93b49301adbf5d4b6ddccfa931.tar.gz external_mesa3d-95e03033127f9b93b49301adbf5d4b6ddccfa931.tar.bz2 | |
mesa: remove Driver.DeleteShader
Nothing overrides it.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/shaderobj.c')
| -rw-r--r-- | src/mesa/main/shaderobj.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 5cd37d7..90600ff 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -74,7 +74,7 @@ _mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr, if (deleteFlag) { if (old->Name != 0) _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name); - ctx->Driver.DeleteShader(ctx, old); + _mesa_delete_shader(ctx, old); } *ptr = NULL; @@ -116,9 +116,8 @@ _mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type) /** * Delete a shader object. - * Called via ctx->Driver.DeleteShader(). */ -static void +void _mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh) { free((void *)sh->Source); @@ -362,7 +361,7 @@ _mesa_free_shader_program_data(struct gl_context *ctx, for (sh = 0; sh < MESA_SHADER_STAGES; sh++) { if (shProg->_LinkedShaders[sh] != NULL) { - ctx->Driver.DeleteShader(ctx, shProg->_LinkedShaders[sh]); + _mesa_delete_shader(ctx, shProg->_LinkedShaders[sh]); shProg->_LinkedShaders[sh] = NULL; } } @@ -439,7 +438,6 @@ void _mesa_init_shader_object_functions(struct dd_function_table *driver) { driver->NewShader = _mesa_new_shader; - driver->DeleteShader = _mesa_delete_shader; driver->NewShaderProgram = _mesa_new_shader_program; driver->DeleteShaderProgram = _mesa_delete_shader_program; driver->LinkShader = _mesa_ir_link_shader; |