summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2008-10-06 18:31:56 -0600
committerBrian <[email protected]>2008-10-06 18:31:56 -0600
commitf7ee3c979261b4a2b77365b47c7147f69fbfd606 (patch)
tree618d61f0f70efb5e8c6d8afe8adee63e4c8e39ed
parentd055b2c001a0fb233f98c10d124b43dd2448059e (diff)
gallium: replace assertion with conditional/recovery code
The assertion failed when we ran out of exec memory. Found with conform texcombine test.
-rw-r--r--src/gallium/auxiliary/rtasm/rtasm_x86sse.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
index dd26d4d9ed2..ad9d8f8ced9 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
@@ -370,7 +370,11 @@ void x86_jcc( struct x86_function *p,
DUMP_I(cc);
if (offset < 0) {
- assert(p->csr - p->store > -offset);
+ /*assert(p->csr - p->store > -offset);*/
+ if (p->csr - p->store <= -offset) {
+ /* probably out of memory (using the error_overflow buffer) */
+ return;
+ }
}
if (offset <= 127 && offset >= -128) {