i965: consolidate generation check
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
This commit is contained in:
parent
e0dc3109d5
commit
7ed5bca21d
|
@ -327,10 +327,15 @@ brw_vs_populate_key(struct brw_context *brw,
|
||||||
_mesa_logbase2(ctx->Transform.ClipPlanesEnabled) + 1;
|
_mesa_logbase2(ctx->Transform.ClipPlanesEnabled) + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* _NEW_POLYGON */
|
|
||||||
if (brw->gen < 6) {
|
if (brw->gen < 6) {
|
||||||
|
/* _NEW_POLYGON */
|
||||||
key->copy_edgeflag = (ctx->Polygon.FrontMode != GL_FILL ||
|
key->copy_edgeflag = (ctx->Polygon.FrontMode != GL_FILL ||
|
||||||
ctx->Polygon.BackMode != 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 |
|
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;
|
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 */
|
/* _NEW_TEXTURE */
|
||||||
brw_populate_sampler_prog_key_data(ctx, prog, &key->tex);
|
brw_populate_sampler_prog_key_data(ctx, prog, &key->tex);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue