From 3e05902d304e71493d05edef4c31c6ed1a22bf17 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 7 Sep 2006 19:58:16 +0000
Subject: [PATCH] Consistent return values from the bm* functions. Get aubfile
 generation working again.

---
 src/mesa/drivers/dri/i965/brw_aub.c           |  2 +-
 src/mesa/drivers/dri/i965/brw_aub.h           |  1 -
 src/mesa/drivers/dri/i965/brw_context.c       |  2 --
 src/mesa/drivers/dri/i965/bufmgr_fake.c       | 14 +++++++-------
 src/mesa/drivers/dri/i965/intel_batchbuffer.c |  2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_aub.c b/src/mesa/drivers/dri/i965/brw_aub.c
index 64abf4ca22f..2b7d1f4356a 100644
--- a/src/mesa/drivers/dri/i965/brw_aub.c
+++ b/src/mesa/drivers/dri/i965/brw_aub.c
@@ -270,7 +270,7 @@ static void brw_aub_dump_bmp( struct intel_context *intel,
 /* Attempt to prevent monster aubfiles by closing and reopening when
  * the state pools wrap.
  */
-void brw_aub_wrap( struct intel_context *intel )
+static void brw_aub_wrap( struct intel_context *intel )
 {
    struct brw_context *brw = brw_context(&intel->ctx);   
    if (intel->aub_file) {
diff --git a/src/mesa/drivers/dri/i965/brw_aub.h b/src/mesa/drivers/dri/i965/brw_aub.h
index 249bc96787b..a2e1f6112dd 100644
--- a/src/mesa/drivers/dri/i965/brw_aub.h
+++ b/src/mesa/drivers/dri/i965/brw_aub.h
@@ -165,6 +165,5 @@ struct intel_context;
 
 int brw_aub_init( struct brw_context *brw );
 void brw_aub_destroy( struct brw_context *brw );
-void brw_aub_wrap( struct intel_context *intel );
 
 #endif
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 2b171cb6513..dba6845e53e 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -138,8 +138,6 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
    driInitExtensions( ctx, brw_extensions, GL_FALSE );
 
    brw_aub_init( brw );
-   brw->intel.vtbl.aub_wrap = brw_aub_wrap;
-
 
    brw_init_attribs( brw );
    brw_init_metaops( brw );
diff --git a/src/mesa/drivers/dri/i965/bufmgr_fake.c b/src/mesa/drivers/dri/i965/bufmgr_fake.c
index 34b62cd12c7..67fa7c8e2e2 100644
--- a/src/mesa/drivers/dri/i965/bufmgr_fake.c
+++ b/src/mesa/drivers/dri/i965/bufmgr_fake.c
@@ -598,7 +598,7 @@ int bmInitPool( struct intel_context *intel,
 		unsigned flags)
 {
    struct bufmgr *bm = intel->bm;
-   int retval;
+   int retval = 0;
 
    LOCK(bm);
    {
@@ -842,7 +842,7 @@ int bmBufferSubData(struct intel_context *intel,
 		     const void *data )
 {
    struct bufmgr *bm = intel->bm;
-   int retval;
+   int retval = 0;
 
    if (size == 0) 
       return 0;
@@ -969,7 +969,7 @@ unsigned bmBufferOffset(struct intel_context *intel,
 			struct buffer *buf)
 {
    struct bufmgr *bm = intel->bm;
-   unsigned retval;
+   unsigned retval = 0;
 
    LOCK(bm);
    {
@@ -1037,7 +1037,7 @@ void *bmMapBuffer( struct intel_context *intel,
 		   unsigned flags )
 {
    struct bufmgr *bm = intel->bm;
-   void *retval;
+   void *retval = NULL;
 
    LOCK(bm);
    {
@@ -1147,7 +1147,7 @@ void bmBufferSetInvalidateCB(struct intel_context *intel,
 int bmValidateBuffers( struct intel_context *intel )
 {
    struct bufmgr *bm = intel->bm;
-   int retval;
+   int retval = 0;
 
    LOCK(bm);
    {
@@ -1206,12 +1206,12 @@ int bmValidateBuffers( struct intel_context *intel )
 	 bm->need_fence = 1;
       }
 
-      retval = !bm->fail;
+      retval = bm->fail ? -1 : 0;
    }
    UNLOCK(bm);
 
 
-   if (!retval)
+   if (retval != 0)
       _mesa_printf("%s failed\n", __FUNCTION__);
 
    return retval;
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 636f3630950..598ce08735d 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -178,7 +178,7 @@ GLboolean intel_batchbuffer_flush( struct intel_batchbuffer *batch )
     */
    offset = bmBufferOffset(batch->intel, batch->buffer);
 
-   if (!bmValidateBuffers( batch->intel )) {
+   if (bmValidateBuffers( batch->intel ) != 0) {
       assert(intel->locked);
       bmReleaseBuffers( batch->intel );
       retval = GL_FALSE;
-- 
2.30.2