[Mesa-dev] [PATCH] i965: consolidate generation check

[Kenneth Graunke]

On Wednesday, July 6, 2016 1:14:37 PM PDT Timothy Arceri wrote:
> ---
>  src/mesa/drivers/dri/i965/brw_vs.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
> index 8f3c7eb..b0a0f23 100644
> --- a/src/mesa/drivers/dri/i965/brw_vs.c
> +++ b/src/mesa/drivers/dri/i965/brw_vs.c
> @@ -329,10 +329,15 @@ brw_vs_populate_key(struct brw_context *brw,
>           _mesa_logbase2(ctx->Transform.ClipPlanesEnabled) + 1;
>     }
>  
> -   /* _NEW_POLYGON */
>     if (brw->gen < 6) {
> +      /* _NEW_POLYGON */
>        key->copy_edgeflag = (ctx->Polygon.FrontMode != GL_FILL ||
>                              ctx->Polygon.BackMode != GL_FILL);
> +
> +      /* _NEW_POINT */
> +      if (ctx->Point.PointSprite) {
> +         key->point_coord_replace = ctx->Point.CoordReplace & 0xff;
> +      }
>     }
>  
>     if (prog->OutputsWritten & (VARYING_BIT_COL0 | VARYING_BIT_COL1 |
> @@ -341,11 +346,6 @@ brw_vs_populate_key(struct brw_context *brw,
>        key->clamp_vertex_color = ctx->Light._ClampVertexColor;
>     }
>  
> -   /* _NEW_POINT */
> -   if (brw->gen < 6 && ctx->Point.PointSprite) {
> -      key->point_coord_replace = ctx->Point.CoordReplace & 0xff;
> -   }
> -
>     /* _NEW_TEXTURE */
>     brw_populate_sampler_prog_key_data(ctx, prog, &key->tex);
>  
> 

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-------------- 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: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160705/b9c466bc/attachment.sig>