fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove Driver.DeleteSamplerObject

Browse source 
Nothing overrides it.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Marek Olšák 2015-09-27 21:28:22 +02:00
parent 00f6beed02
commit 92709dcb9b
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/main/dd.h
View file

@ -875,8 +875,6 @@ struct dd_function_table {
*/
struct gl_sampler_object * (*NewSamplerObject)(struct gl_context *ctx,
GLuint name);
void (*DeleteSamplerObject)(struct gl_context *ctx,
struct gl_sampler_object *samp);
/**
* \name Return a timestamp in nanoseconds as defined by GL_ARB_timer_query.

28
src/mesa/main/samplerobj.c
View file

@ -72,6 +72,14 @@ lookup_samplerobj_locked(struct gl_context *ctx, GLuint name)
_mesa_HashLookupLocked(ctx->Shared->SamplerObjects, name);
}
static void
delete_sampler_object(struct gl_context *ctx,
struct gl_sampler_object *sampObj)
{
mtx_destroy(&sampObj->Mutex);
free(sampObj->Label);
free(sampObj);
}
/**
* Handle reference counting.
@ -94,10 +102,8 @@ _mesa_reference_sampler_object_(struct gl_context *ctx,
deleteFlag = (oldSamp->RefCount == 0);
mtx_unlock(&oldSamp->Mutex);
if (deleteFlag) {
assert(ctx->Driver.DeleteSamplerObject);
ctx->Driver.DeleteSamplerObject(ctx, oldSamp);
}
if (deleteFlag)
delete_sampler_object(ctx, oldSamp);
*ptr = NULL;
}
@ -162,19 +168,6 @@ _mesa_new_sampler_object(struct gl_context *ctx, GLuint name)
return sampObj;
}
/**
* Fallback for ctx->Driver.DeleteSamplerObject();
*/
static void
_mesa_delete_sampler_object(struct gl_context *ctx,
struct gl_sampler_object *sampObj)
{
mtx_destroy(&sampObj->Mutex);
free(sampObj->Label);
free(sampObj);
}
static void
create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers,
const char *caller)
@ -1626,5 +1619,4 @@ void
_mesa_init_sampler_object_functions(struct dd_function_table *driver)
{
driver->NewSamplerObject = _mesa_new_sampler_object;
driver->DeleteSamplerObject = _mesa_delete_sampler_object;
}