Mesa (master): r600g: check NULL return from r600_aligned_buffer_create
Julien Isorce
cap at kemper.freedesktop.org
Tue Mar 28 17:29:22 UTC 2017
Module: Mesa
Branch: master
Commit: 7ee91af30074a4381e4353122319e3b4b3fe7cbd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ee91af30074a4381e4353122319e3b4b3fe7cbd
Author: Julien Isorce <jisorce at oblong.com>
Date: Thu Mar 23 14:25:39 2017 +0000
r600g: check NULL return from r600_aligned_buffer_create
Signed-off-by: Julien Isorce <jisorce at oblong.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/gallium/drivers/r600/r600_state.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 6139bd2f05..9ca113ac88 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -983,6 +983,11 @@ static void r600_init_color_surface(struct r600_context *rctx,
PIPE_USAGE_DEFAULT,
cmask.size, cmask.alignment);
+ if (unlikely(!rctx->dummy_cmask)) {
+ surf->color_initialized = false;
+ return;
+ }
+
/* Set the contents to 0xCC. */
ptr = pipe_buffer_map(&rctx->b.b, &rctx->dummy_cmask->b.b, PIPE_TRANSFER_WRITE, &transfer);
memset(ptr, 0xCC, cmask.size);
@@ -999,6 +1004,11 @@ static void r600_init_color_surface(struct r600_context *rctx,
r600_aligned_buffer_create(&rscreen->b.b, 0,
PIPE_USAGE_DEFAULT,
fmask.size, fmask.alignment);
+
+ if (unlikely(!rctx->dummy_fmask)) {
+ surf->color_initialized = false;
+ return;
+ }
}
r600_resource_reference(&surf->cb_buffer_fmask, rctx->dummy_fmask);
More information about the mesa-commit
mailing list