projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
282b378
)
gallium/radeon: handle buffer alloc failures in r600_draw_rectangle
author
Marek Olšák
<marek.olsak@amd.com>
Thu, 10 Sep 2015 15:54:41 +0000
(17:54 +0200)
committer
Marek Olšák
<marek.olsak@amd.com>
Thu, 24 Sep 2015 17:51:42 +0000
(19:51 +0200)
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>
src/gallium/drivers/radeon/r600_pipe_common.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/radeon/r600_pipe_common.c
b/src/gallium/drivers/radeon/r600_pipe_common.c
index 836da76c0bcc9d5ae7d2611e448d88064eb11617..d97b721a12f54f7f76344c36c61b4f47217647d2 100644
(file)
--- 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;