summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/llvmpipe/lp_setup_line.c
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2010-10-08 17:01:16 +0100
committerKeith Whitwell <keithw@vmware.com>2010-10-08 17:26:29 +0100
commitad6730fadbbeacea96322e31064ede9ea7ebad6f (patch)
tree919e2537e338a16cdb7f0967c2da22ffda36b111 /src/gallium/drivers/llvmpipe/lp_setup_line.c
parenteb605701aa4af9ea44004008256a5707e470738c (diff)
llvmpipe: fail gracefully on oom in scene creation
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_setup_line.c')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_setup_line.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_line.c b/src/gallium/drivers/llvmpipe/lp_setup_line.c
index 156bd63375..4d7d6235b0 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_line.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_line.c
@@ -712,10 +712,11 @@ static void lp_setup_line( struct lp_setup_context *setup,
{
if (!try_setup_line( setup, v0, v1 ))
{
- lp_setup_flush_and_restart(setup);
+ if (!lp_setup_flush_and_restart(setup))
+ return;
if (!try_setup_line( setup, v0, v1 ))
- assert(0);
+ return;
}
}