summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-09-10 17:54:41 +0200
committerMarek Olšák <marek.olsak@amd.com>2015-09-24 19:51:42 +0200
commitf95e695059c428a21a1e1a27d5cd5ccce2a97b0e (patch)
tree3277f89acb56d08d5ddfe4cb08e14d9d899c55bb /src/gallium
parent282b3780123bace557fc90127bd35b075ea0873e (diff)
downloadexternal_mesa3d-f95e695059c428a21a1e1a27d5cd5ccce2a97b0e.zip
external_mesa3d-f95e695059c428a21a1e1a27d5cd5ccce2a97b0e.tar.gz
external_mesa3d-f95e695059c428a21a1e1a27d5cd5ccce2a97b0e.tar.bz2
gallium/radeon: handle buffer alloc failures in r600_draw_rectangle
Cc: 11.0 <mesa-stable@lists.freedesktop.org> Acked-by: Christian König <christian.koenig@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/radeon/r600_pipe_common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 836da76..d97b721 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -78,6 +78,9 @@ void r600_draw_rectangle(struct blitter_context *blitter,
* I guess the 4th one is derived from the first 3.
* The vertex specification should match u_blitter's vertex element state. */
u_upload_alloc(rctx->uploader, 0, sizeof(float) * 24, &offset, &buf, (void**)&vb);
+ if (!buf)
+ return;
+
vb[0] = x1;
vb[1] = y1;
vb[2] = depth;