Mesa (master): i965: Just return void from brw_try_draw_prims

Ian Romanick idr at kemper.freedesktop.org
Tue Dec 2 22:56:44 UTC 2014


Module: Mesa
Branch: master
Commit: 0391d1bbeacbe3605beaec10711d936348c9bcab
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0391d1bbeacbe3605beaec10711d936348c9bcab

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Nov 11 14:10:06 2014 +0000

i965: Just return void from brw_try_draw_prims

Note from Ken:

    "We used to use the return value to indicate whether software
    fallbacks were necessary, but we haven't in years."

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_draw.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index b28eaf2..4c2802a 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -347,7 +347,7 @@ static void brw_postdraw_set_buffers_need_resolve(struct brw_context *brw)
 /* May fail if out of video memory for texture or vbo upload, or on
  * fallback conditions.
  */
-static bool brw_try_draw_prims( struct gl_context *ctx,
+static void brw_try_draw_prims( struct gl_context *ctx,
 				     const struct gl_client_array *arrays[],
 				     const struct _mesa_prim *prims,
 				     GLuint nr_prims,
@@ -357,7 +357,6 @@ static bool brw_try_draw_prims( struct gl_context *ctx,
 				     struct gl_buffer_object *indirect)
 {
    struct brw_context *brw = brw_context(ctx);
-   bool retval = true;
    GLuint i;
    bool fail_next = false;
 
@@ -487,8 +486,6 @@ retry:
 			  "available aperture space\n");
 		  warned = true;
 	       }
-
-	       retval = false;
 	    }
 	 }
       }
@@ -506,7 +503,7 @@ retry:
    brw_state_cache_check_size(brw);
    brw_postdraw_set_buffers_need_resolve(brw);
 
-   return retval;
+   return;
 }
 
 void brw_draw_prims( struct gl_context *ctx,




More information about the mesa-commit mailing list