[Mesa-dev] [PATCH 6/7] i965: Just return void from brw_try_draw_prims

[Kenneth Graunke]

On Thursday, November 20, 2014 11:14:54 AM Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>

Suggested commit message addition:

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

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,
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20141120/caa39f74/attachment.sig>