diff options
| author | Jason Ekstrand <[email protected]> | 2018-05-04 22:41:19 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2018-05-08 08:27:44 -0700 |
| commit | ccd3dce3c059ad6d24ab50107ac6bb8827f46c3d (patch) | |
| tree | 05248a546a9902defbc7671c56f2461f228fae8e /src/mesa | |
| parent | 514bb6f41ec139baeaf56b57d7bc1034fb114234 (diff) | |
i965: Use the brw_depthbuffer atom on all gens
The only reason why we had two atoms was that the one we used for gen7+
depended on _NEW_DEPTH and _NEW_STENCIL as well as _NEW_BUFFERS. Since
this is no longer true, we can combine them into one atom. We do add a
dependence on BRW_NEW_AUX_STATE but that should never get set on gen4-5
so adding it is a no-op for those platforms.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_misc_state.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_misc_state.c | 13 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_state_upload.c | 4 |
4 files changed, 4 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 05517ebf587..0ab1f128011 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -410,7 +410,8 @@ brw_emit_depth_stencil_hiz(struct brw_context *brw, const struct brw_tracked_state brw_depthbuffer = { .dirty = { .mesa = _NEW_BUFFERS, - .brw = BRW_NEW_BATCH | + .brw = BRW_NEW_AUX_STATE | + BRW_NEW_BATCH | BRW_NEW_BLORP, }, .emit = brw_emit_depthbuffer, diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index 0417cc2aae0..f89182a0017 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -89,7 +89,6 @@ extern const struct brw_tracked_state gen6_sampler_state; extern const struct brw_tracked_state gen6_sol_surface; extern const struct brw_tracked_state gen6_sf_vp; extern const struct brw_tracked_state gen6_urb; -extern const struct brw_tracked_state gen7_depthbuffer; extern const struct brw_tracked_state gen7_l3_state; extern const struct brw_tracked_state gen7_push_constant_space; extern const struct brw_tracked_state gen7_urb; diff --git a/src/mesa/drivers/dri/i965/gen7_misc_state.c b/src/mesa/drivers/dri/i965/gen7_misc_state.c index 42ab271e6ae..5c88cf55fa0 100644 --- a/src/mesa/drivers/dri/i965/gen7_misc_state.c +++ b/src/mesa/drivers/dri/i965/gen7_misc_state.c @@ -186,16 +186,3 @@ gen7_emit_depth_stencil_hiz(struct brw_context *brw, brw->no_depth_or_stencil = !mt; } - -/** - * \see brw_context.state.depth_region - */ -const struct brw_tracked_state gen7_depthbuffer = { - .dirty = { - .mesa = _NEW_BUFFERS, - .brw = BRW_NEW_AUX_STATE | - BRW_NEW_BATCH | - BRW_NEW_BLORP, - }, - .emit = brw_emit_depthbuffer, -}; diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index b1867c1a1cc..091e4137aa1 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -5603,7 +5603,7 @@ genX(init_atoms)(struct brw_context *brw) &genX(scissor_state), - &gen7_depthbuffer, + &brw_depthbuffer, &genX(polygon_stipple), &genX(polygon_stipple_offset), @@ -5694,7 +5694,7 @@ genX(init_atoms)(struct brw_context *brw) &genX(scissor_state), - &gen7_depthbuffer, + &brw_depthbuffer, &genX(polygon_stipple), &genX(polygon_stipple_offset), |