[Mesa-dev] [PATCH 038/101] mesa: add delete_samplers() helper

[Samuel Pitoiset]

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/mesa/main/samplerobj.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index d182ee03c0..aae2a6bbbf 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -222,22 +222,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 =
@@ -264,6 +256,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)
 {
-- 
2.13.3