diff options
| -rw-r--r-- | src/mesa/main/samplerobj.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 59ec813013e..4cb4914731b 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -231,22 +231,14 @@ _mesa_CreateSamplers(GLsizei count, GLuint *samplers) } -void GLAPIENTRY -_mesa_DeleteSamplers(GLsizei count, const GLuint *samplers) +static void +delete_samplers(struct gl_context *ctx, GLsizei count, const GLuint *samplers) { - GET_CURRENT_CONTEXT(ctx); - GLsizei i; - FLUSH_VERTICES(ctx, 0); - if (count < 0) { - _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteSamplers(count)"); - return; - } - _mesa_HashLockMutex(ctx->Shared->SamplerObjects); - for (i = 0; i < count; i++) { + for (GLsizei i = 0; i < count; i++) { if (samplers[i]) { GLuint j; struct gl_sampler_object *sampObj = @@ -273,6 +265,20 @@ _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers) } +void GLAPIENTRY +_mesa_DeleteSamplers(GLsizei count, const GLuint *samplers) +{ + GET_CURRENT_CONTEXT(ctx); + + if (count < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteSamplers(count)"); + return; + } + + delete_samplers(ctx, count, samplers); +} + + GLboolean GLAPIENTRY _mesa_IsSampler(GLuint sampler) { |