diff options
| -rw-r--r-- | src/mesa/main/samplerobj.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index d3ed4da3932..7ac1743e2d3 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -154,20 +154,11 @@ _mesa_new_sampler_object(struct gl_context *ctx, GLuint name) } static void -create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers, - const char *caller) +create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers) { GLuint first; GLint i; - if (MESA_VERBOSE & VERBOSE_API) - _mesa_debug(ctx, "%s(%d)\n", caller, count); - - if (count < 0) { - _mesa_error(ctx, GL_INVALID_VALUE, "%s(n<0)", caller); - return; - } - if (!samplers) return; @@ -186,18 +177,34 @@ create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers, _mesa_HashUnlockMutex(ctx->Shared->SamplerObjects); } +static void +create_samplers_err(struct gl_context *ctx, GLsizei count, GLuint *samplers, + const char *caller) +{ + + if (MESA_VERBOSE & VERBOSE_API) + _mesa_debug(ctx, "%s(%d)\n", caller, count); + + if (count < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, "%s(n<0)", caller); + return; + } + + create_samplers(ctx, count, samplers); +} + void GLAPIENTRY _mesa_GenSamplers(GLsizei count, GLuint *samplers) { GET_CURRENT_CONTEXT(ctx); - create_samplers(ctx, count, samplers, "glGenSamplers"); + create_samplers_err(ctx, count, samplers, "glGenSamplers"); } void GLAPIENTRY _mesa_CreateSamplers(GLsizei count, GLuint *samplers) { GET_CURRENT_CONTEXT(ctx); - create_samplers(ctx, count, samplers, "glCreateSamplers"); + create_samplers_err(ctx, count, samplers, "glCreateSamplers"); } |