From: Keith Whitwell <keithw@vmware.com>
Date: Thu, 5 Nov 2009 08:01:48 +0000 (+0000)
Subject: i965g: use pipe_error return value for brw_batchbuffer_require_space
X-Git-Tag: 062012170305~15466^2~108
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2bf5f98d923b8d52473e069576fc6514c0ffd0a;p=profile%2Fivi%2Fmesa.git

i965g: use pipe_error return value for brw_batchbuffer_require_space

trivial/tri runs without crashing (on debug winsys) but still produces
obviously incorrect command buffers.
---

diff --git a/src/gallium/drivers/i965/brw_batchbuffer.h b/src/gallium/drivers/i965/brw_batchbuffer.h
index 781cd69..1f04826 100644
--- a/src/gallium/drivers/i965/brw_batchbuffer.h
+++ b/src/gallium/drivers/i965/brw_batchbuffer.h
@@ -103,19 +103,19 @@ brw_batchbuffer_emit_dword(struct brw_batchbuffer *batch, GLuint dword)
    batch->ptr += 4;
 }
 
-static INLINE boolean
+static INLINE enum pipe_error
 brw_batchbuffer_require_space(struct brw_batchbuffer *batch,
                                 GLuint sz)
 {
    assert(sz < batch->size - 8);
    if (brw_batchbuffer_space(batch) < sz) {
       assert(0);
-      return FALSE;
+      return PIPE_ERROR_OUT_OF_MEMORY;
    }
 #ifdef DEBUG
    batch->emit.end_ptr = batch->ptr + sz;
 #endif
-   return TRUE;
+   return 0;
 }
 
 /* Here are the crusty old macros, to be removed: