Mesa (master): mesa: pass the 'caller' function to create_samplers()
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Mon Jul 24 14:44:42 UTC 2017
Module: Mesa
Branch: master
Commit: b2448468213e5157d1d12545d049b02104f4edc2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2448468213e5157d1d12545d049b02104f4edc2
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Fri Jul 21 14:42:05 2017 +0200
mesa: pass the 'caller' function to create_samplers()
To return GL_OUT_OF_MEMORY if NewSamplerObject fails.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
---
src/mesa/main/samplerobj.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 26e7725249..326eceb1aa 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -154,7 +154,8 @@ _mesa_new_sampler_object(struct gl_context *ctx, GLuint name)
}
static void
-create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers)
+create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers,
+ const char *caller)
{
GLuint first;
GLint i;
@@ -190,14 +191,14 @@ create_samplers_err(struct gl_context *ctx, GLsizei count, GLuint *samplers,
return;
}
- create_samplers(ctx, count, samplers);
+ create_samplers(ctx, count, samplers, caller);
}
void GLAPIENTRY
_mesa_GenSamplers_no_error(GLsizei count, GLuint *samplers)
{
GET_CURRENT_CONTEXT(ctx);
- create_samplers(ctx, count, samplers);
+ create_samplers(ctx, count, samplers, "glGenSamplers");
}
void GLAPIENTRY
@@ -211,7 +212,7 @@ void GLAPIENTRY
_mesa_CreateSamplers_no_error(GLsizei count, GLuint *samplers)
{
GET_CURRENT_CONTEXT(ctx);
- create_samplers(ctx, count, samplers);
+ create_samplers(ctx, count, samplers, "glCreateSamplers");
}
void GLAPIENTRY
More information about the mesa-commit
mailing list