fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Use the brw_depthbuffer atom on all gens

Browse source 
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 <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2018-05-04 22:41:19 -07:00
parent 514bb6f41e
commit ccd3dce3c0
4 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/i965/brw_misc_state.c
View file

@ -410,7 +410,8 @@ brw_emit_depth_stencil_hiz(struct brw_context *brw,
const struct brw_tracked_state brw_depthbuffer = { const struct brw_tracked_state brw_depthbuffer = {
.dirty = { .dirty = {
.mesa = _NEW_BUFFERS, .mesa = _NEW_BUFFERS,
.brw = BRW_NEW_BATCH | .brw = BRW_NEW_AUX_STATE |
BRW_NEW_BATCH |
BRW_NEW_BLORP, BRW_NEW_BLORP,
}, },
.emit = brw_emit_depthbuffer, .emit = brw_emit_depthbuffer,

1
src/mesa/drivers/dri/i965/brw_state.h
View file

@ -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_sol_surface;
extern const struct brw_tracked_state gen6_sf_vp; extern const struct brw_tracked_state gen6_sf_vp;
extern const struct brw_tracked_state gen6_urb; 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_l3_state;
extern const struct brw_tracked_state gen7_push_constant_space; extern const struct brw_tracked_state gen7_push_constant_space;
extern const struct brw_tracked_state gen7_urb; extern const struct brw_tracked_state gen7_urb;

13
src/mesa/drivers/dri/i965/gen7_misc_state.c
View file

@ -186,16 +186,3 @@ gen7_emit_depth_stencil_hiz(struct brw_context *brw,
brw->no_depth_or_stencil = !mt; 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,
};

4
src/mesa/drivers/dri/i965/genX_state_upload.c
View file

@ -5603,7 +5603,7 @@ genX(init_atoms)(struct brw_context *brw)
&genX(scissor_state), &genX(scissor_state),
&gen7_depthbuffer, &brw_depthbuffer,
&genX(polygon_stipple), &genX(polygon_stipple),
&genX(polygon_stipple_offset), &genX(polygon_stipple_offset),
@ -5694,7 +5694,7 @@ genX(init_atoms)(struct brw_context *brw)
&genX(scissor_state), &genX(scissor_state),
&gen7_depthbuffer, &brw_depthbuffer,
&genX(polygon_stipple), &genX(polygon_stipple),
&genX(polygon_stipple_offset), &genX(polygon_stipple_offset),