Mesa (master): i965/vs: When failing due to lack of spilling, don' t continue on.

Eric Anholt anholt at kemper.freedesktop.org
Fri Sep 9 04:40:33 UTC 2011


Module: Mesa
Branch: master
Commit: 14081695137c095f0a8430779ecb09165bec6455
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=14081695137c095f0a8430779ecb09165bec6455

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Sep  7 10:32:20 2011 -0700

i965/vs: When failing due to lack of spilling, don't continue on.

Fixes assertion failure from double-free in oglc
glsl-arrayobject constructor.declaration.structure

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 .../drivers/dri/i965/brw_vec4_reg_allocate.cpp     |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
index 9fd4922..1ace91f 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
@@ -205,6 +205,7 @@ vec4_visitor::reg_allocate()
    if (!ra_allocate_no_spills(g)) {
       ralloc_free(g);
       fail("No register spilling support yet\n");
+      return;
    }
 
    /* Get the chosen virtual registers for each node, and map virtual




More information about the mesa-commit mailing list