From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 7 Oct 2008 00:31:56 +0000 (-0600)
Subject: gallium: replace assertion with conditional/recovery code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f7ee3c979261b4a2b77365b47c7147f69fbfd606;p=mesa.git

gallium: replace assertion with conditional/recovery code

The assertion failed when we ran out of exec memory.
Found with conform texcombine test.
---

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) {