fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 01:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Merge gen7_clip_state atom into gen6_clip_state atom.

Browse source 
The original motivation was that gen6_clip_state ignored _NEW_POLYGON
as it didn't care about early culling.  The only other change was that
Gen6 ignored BRW_NEW_TES_PROG_DATA as it doesn't have tessellation
shaders, but listening to this is harmless as it'll never be signalled.

Now that we've added _NEW_POLYGON for is_drawing_lines/points, we can
merge the two as the distinction is meaningless.

This actually fixes a bug, though: Gen8+ was using the gen6_clip_state
atom because it doesn't care about early culling, but it also needs
BRW_NEW_TES_PROG_DATA, which was missing.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Kenneth Graunke 2016-08-30 13:16:02 -07:00
parent 4c116cbafb
commit bea048752e
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,6 @@ extern const struct brw_tracked_state gen6_vs_state;
extern const struct brw_tracked_state gen6_wm_push_constants;
extern const struct brw_tracked_state gen6_wm_state;
extern const struct brw_tracked_state gen7_depthbuffer;
extern const struct brw_tracked_state gen7_clip_state;
extern const struct brw_tracked_state gen7_ds_state;
extern const struct brw_tracked_state gen7_gs_state;
extern const struct brw_tracked_state gen7_tcs_push_constants;

2
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -237,7 +237,7 @@ static const struct brw_tracked_state *gen7_render_atoms[] =
&gen7_ds_state,
&gen7_gs_state,
&gen7_sol_state,
&gen7_clip_state,
&gen6_clip_state,
&gen7_sbe_state,
&gen7_sf_state,
&gen7_wm_state,

18
src/mesa/drivers/dri/i965/gen6_clip_state.c
View file

@ -255,24 +255,6 @@ upload_clip_state(struct brw_context *brw)
}
const struct brw_tracked_state gen6_clip_state = {
.dirty = {
.mesa = _NEW_BUFFERS |
_NEW_LIGHT |
_NEW_POLYGON |
_NEW_TRANSFORM,
.brw = BRW_NEW_BLORP |
BRW_NEW_CONTEXT |
BRW_NEW_FS_PROG_DATA |
BRW_NEW_GS_PROG_DATA |
BRW_NEW_META_IN_PROGRESS |
BRW_NEW_PRIMITIVE |
BRW_NEW_RASTERIZER_DISCARD |
BRW_NEW_VUE_MAP_GEOM_OUT,
},
.emit = upload_clip_state,
};
const struct brw_tracked_state gen7_clip_state = {
.dirty = {
.mesa = _NEW_BUFFERS |
_NEW_LIGHT |