i965: Update 3DSTATE_CLIP for Broadwell.
Broadwell's winding order, polygon fill, and viewport Z test fields have moved to DWord 1 of 3DSTATE_RASTER. v2: Add a perf_debug for a future optimization and improve commit message (both suggested by Eric Anholt). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
5c0d7dbcb9
commit
3d3c351cfb
|
@ -300,7 +300,7 @@ static const struct brw_tracked_state *gen8_atoms[] =
|
||||||
&gen8_vs_state,
|
&gen8_vs_state,
|
||||||
&gen7_gs_state,
|
&gen7_gs_state,
|
||||||
&gen7_sol_state,
|
&gen7_sol_state,
|
||||||
&gen7_clip_state,
|
&gen6_clip_state,
|
||||||
&gen8_raster_state,
|
&gen8_raster_state,
|
||||||
&gen8_sbe_state,
|
&gen8_sbe_state,
|
||||||
&gen8_sf_state,
|
&gen8_sf_state,
|
||||||
|
|
|
@ -49,9 +49,10 @@ upload_clip_state(struct brw_context *brw)
|
||||||
dw2 |= GEN6_CLIP_NON_PERSPECTIVE_BARYCENTRIC_ENABLE;
|
dw2 |= GEN6_CLIP_NON_PERSPECTIVE_BARYCENTRIC_ENABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (brw->gen >= 7) {
|
if (brw->gen >= 7)
|
||||||
dw1 |= GEN7_CLIP_EARLY_CULL;
|
dw1 |= GEN7_CLIP_EARLY_CULL;
|
||||||
|
|
||||||
|
if (brw->gen == 7) {
|
||||||
/* _NEW_POLYGON */
|
/* _NEW_POLYGON */
|
||||||
if ((ctx->Polygon.FrontFace == GL_CCW) ^ _mesa_is_user_fbo(fb))
|
if ((ctx->Polygon.FrontFace == GL_CCW) ^ _mesa_is_user_fbo(fb))
|
||||||
dw1 |= GEN7_CLIP_WINDING_CCW;
|
dw1 |= GEN7_CLIP_WINDING_CCW;
|
||||||
|
@ -76,7 +77,7 @@ upload_clip_state(struct brw_context *brw)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ctx->Transform.DepthClamp)
|
if (brw->gen < 8 && !ctx->Transform.DepthClamp)
|
||||||
dw2 |= GEN6_CLIP_Z_TEST;
|
dw2 |= GEN6_CLIP_Z_TEST;
|
||||||
|
|
||||||
/* _NEW_LIGHT */
|
/* _NEW_LIGHT */
|
||||||
|
@ -103,6 +104,10 @@ upload_clip_state(struct brw_context *brw)
|
||||||
ctx->ViewportArray[i].Width != (float) fb->Width ||
|
ctx->ViewportArray[i].Width != (float) fb->Width ||
|
||||||
ctx->ViewportArray[i].Height != (float) fb->Height) {
|
ctx->ViewportArray[i].Height != (float) fb->Height) {
|
||||||
dw2 &= ~GEN6_CLIP_GB_TEST;
|
dw2 &= ~GEN6_CLIP_GB_TEST;
|
||||||
|
if (brw->gen >= 8) {
|
||||||
|
perf_debug("Disabling GB clipping due to lack of Gen8 viewport "
|
||||||
|
"clipping setup code. This should be fixed.");
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue