From 2786343896030ed4abcf6674a3e66f3a0d246e0d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 17 May 2012 13:53:15 -0600
Subject: [PATCH] svga: return PIPE_OK instead of 0

And fix the emit_rss() function's return type.
---
 src/gallium/drivers/svga/svga_state_constants.c   | 2 +-
 src/gallium/drivers/svga/svga_state_framebuffer.c | 6 +++---
 src/gallium/drivers/svga/svga_state_need_swtnl.c  | 6 +++---
 src/gallium/drivers/svga/svga_state_rss.c         | 6 +++---
 src/gallium/drivers/svga/svga_state_vs.c          | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_state_constants.c b/src/gallium/drivers/svga/svga_state_constants.c
index 245b6d4..70682d1 100644
--- a/src/gallium/drivers/svga/svga_state_constants.c
+++ b/src/gallium/drivers/svga/svga_state_constants.c
@@ -307,7 +307,7 @@ emit_fs_consts(struct svga_context *svga, unsigned dirty)
       offset += key->num_unnormalized_coords;
    }
 
-   return 0;
+   return PIPE_OK;
 }
 
 
diff --git a/src/gallium/drivers/svga/svga_state_framebuffer.c b/src/gallium/drivers/svga/svga_state_framebuffer.c
index 402d5fe..cf3310a 100644
--- a/src/gallium/drivers/svga/svga_state_framebuffer.c
+++ b/src/gallium/drivers/svga/svga_state_framebuffer.c
@@ -91,7 +91,7 @@ emit_framebuffer( struct svga_context *svga,
 
    svga->rebind.rendertargets = FALSE;
 
-   return 0;
+   return PIPE_OK;
 }
 
 
@@ -439,7 +439,7 @@ out:
       svga->state.hw_clear.prescale = prescale;
    }
 
-   return 0;
+   return PIPE_OK;
 }
 
 
@@ -519,7 +519,7 @@ emit_clip_planes( struct svga_context *svga,
          return ret;
    }
 
-   return 0;
+   return PIPE_OK;
 }
 
 
diff --git a/src/gallium/drivers/svga/svga_state_need_swtnl.c b/src/gallium/drivers/svga/svga_state_need_swtnl.c
index ce4db8d..7048668 100644
--- a/src/gallium/drivers/svga/svga_state_need_swtnl.c
+++ b/src/gallium/drivers/svga/svga_state_need_swtnl.c
@@ -97,7 +97,7 @@ update_need_swvfetch( struct svga_context *svga,
       svga->dirty |= SVGA_NEW_NEED_SWVFETCH;
    }
    
-   return 0;
+   return PIPE_OK;
 }
 
 struct svga_tracked_state svga_update_need_swvfetch = 
@@ -172,7 +172,7 @@ update_need_pipeline( struct svga_context *svga,
    if (0 && svga->state.sw.need_pipeline)
       debug_printf("sw.need_pipeline = %d\n", svga->state.sw.need_pipeline);
 
-   return 0;
+   return PIPE_OK;
 }
 
 
@@ -228,7 +228,7 @@ update_need_swtnl( struct svga_context *svga,
       svga->swtnl.new_vdecl = TRUE;
    }
   
-   return 0;
+   return PIPE_OK;
 }
 
 
diff --git a/src/gallium/drivers/svga/svga_state_rss.c b/src/gallium/drivers/svga/svga_state_rss.c
index a2bcf24..6a73924 100644
--- a/src/gallium/drivers/svga/svga_state_rss.c
+++ b/src/gallium/drivers/svga/svga_state_rss.c
@@ -75,8 +75,8 @@ svga_queue_rs( struct rs_queue *q,
  * to hardware.  Simplest implementation would be to emit the whole of
  * the "to" state.
  */
-static int emit_rss( struct svga_context *svga,
-                     unsigned dirty )
+static enum pipe_error
+emit_rss(struct svga_context *svga, unsigned dirty)
 {
    struct svga_screen *screen = svga_screen(svga->pipe.screen);
    struct rs_queue queue;
@@ -269,7 +269,7 @@ static int emit_rss( struct svga_context *svga,
       SVGA_FIFOCommitAll( svga->swc );
    }
 
-   return 0;
+   return PIPE_OK;
 
 fail:
    /* XXX: need to poison cached hardware state on failure to ensure
diff --git a/src/gallium/drivers/svga/svga_state_vs.c b/src/gallium/drivers/svga/svga_state_vs.c
index 1d140bd..e8c953b 100644
--- a/src/gallium/drivers/svga/svga_state_vs.c
+++ b/src/gallium/drivers/svga/svga_state_vs.c
@@ -294,7 +294,7 @@ update_zero_stride( struct svga_context *svga,
    if (svga->curr.num_zero_stride_vertex_elements)
       svga->dirty |= SVGA_NEW_ZERO_STRIDE;
 
-   return 0;
+   return PIPE_OK;
 }
 
 struct svga_tracked_state svga_hw_update_zero_stride =
-- 
2.7.4