summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-07-06 13:14:37 +1000
committerTimothy Arceri <[email protected]>2016-07-07 12:29:21 +1000
commit7ed5bca21dcce6c225b904e5f610810b9866796f (patch)
tree6cab8fdeb8a9e3e62d7cb0d481fa25fd9a328457
parente0dc3109d50b2d73747db1f6d7ff31b2bd935539 (diff)
i965: consolidate generation check
Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_vs.c12
1 files 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 cda95f81f1b..30499e7b9f2 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -327,10 +327,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 |
@@ -339,11 +344,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);