Mesa (master): mesa: return GL_OUT_OF_MEMORY if NewSamplerObject fails
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Mon Jul 24 14:44:42 UTC 2017
Module: Mesa
Branch: master
Commit: 986f9e50ded299802fc0ad63e5643f6df62c31ec
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=986f9e50ded299802fc0ad63e5643f6df62c31ec
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Fri Jul 21 14:42:06 2017 +0200
mesa: return GL_OUT_OF_MEMORY if NewSamplerObject fails
This is similar to other functions that create objects.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
---
src/mesa/main/samplerobj.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 326eceb1aa..7446441086 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -169,10 +169,18 @@ create_samplers(struct gl_context *ctx, GLsizei count, GLuint *samplers,
/* Insert the ID and pointer to new sampler object into hash table */
for (i = 0; i < count; i++) {
- struct gl_sampler_object *sampObj =
- ctx->Driver.NewSamplerObject(ctx, first + i);
- _mesa_HashInsertLocked(ctx->Shared->SamplerObjects, first + i, sampObj);
- samplers[i] = first + i;
+ struct gl_sampler_object *sampObj;
+ GLuint name = first + i;
+
+ sampObj = ctx->Driver.NewSamplerObject(ctx, name);
+ if (!sampObj) {
+ _mesa_HashUnlockMutex(ctx->Shared->SamplerObjects);
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", caller);
+ return;
+ }
+
+ _mesa_HashInsertLocked(ctx->Shared->SamplerObjects, name, sampObj);
+ samplers[i] = name;
}
_mesa_HashUnlockMutex(ctx->Shared->SamplerObjects);
More information about the mesa-commit
mailing list