OSDN Git Service

i965: Just return void from brw_try_draw_prims
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 11 Nov 2014 14:10:06 +0000 (14:10 +0000)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 2 Dec 2014 20:16:28 +0000 (12:16 -0800)
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@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/drivers/dri/i965/brw_draw.c

index b28eaf2..4c2802a 100644 (file)
@@ -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,