diff options
52 files changed, 359 insertions, 283 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c index cb50d3b8ddf..bf996899e81 100644 --- a/src/mesa/drivers/dri/i965/brw_binding_tables.c +++ b/src/mesa/drivers/dri/i965/brw_binding_tables.c @@ -130,7 +130,8 @@ brw_upload_wm_binding_table(struct brw_context *brw) const struct brw_tracked_state brw_wm_binding_table = { .dirty = { .mesa = 0, - .brw = BRW_NEW_BATCH | BRW_NEW_SURFACES, + .brw = BRW_NEW_BATCH | + BRW_NEW_SURFACES, .cache = CACHE_NEW_WM_PROG }, .emit = brw_upload_wm_binding_table, @@ -189,11 +190,11 @@ gen4_upload_binding_table_pointers(struct brw_context *brw) const struct brw_tracked_state brw_binding_table_pointers = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_STATE_BASE_ADDRESS | - BRW_NEW_VS_BINDING_TABLE | - BRW_NEW_GS_BINDING_TABLE | - BRW_NEW_PS_BINDING_TABLE), + .brw = BRW_NEW_BATCH | + BRW_NEW_GS_BINDING_TABLE | + BRW_NEW_PS_BINDING_TABLE | + BRW_NEW_STATE_BASE_ADDRESS | + BRW_NEW_VS_BINDING_TABLE, .cache = 0, }, .emit = gen4_upload_binding_table_pointers, @@ -226,11 +227,11 @@ gen6_upload_binding_table_pointers(struct brw_context *brw) const struct brw_tracked_state gen6_binding_table_pointers = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_STATE_BASE_ADDRESS | - BRW_NEW_VS_BINDING_TABLE | - BRW_NEW_GS_BINDING_TABLE | - BRW_NEW_PS_BINDING_TABLE), + .brw = BRW_NEW_BATCH | + BRW_NEW_GS_BINDING_TABLE | + BRW_NEW_PS_BINDING_TABLE | + BRW_NEW_STATE_BASE_ADDRESS | + BRW_NEW_VS_BINDING_TABLE, .cache = 0, }, .emit = gen6_upload_binding_table_pointers, diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c index 289f65b5a8a..62c9261e448 100644 --- a/src/mesa/drivers/dri/i965/brw_cc.c +++ b/src/mesa/drivers/dri/i965/brw_cc.c @@ -67,7 +67,8 @@ brw_upload_cc_vp(struct brw_context *brw) const struct brw_tracked_state brw_cc_vp = { .dirty = { - .mesa = _NEW_VIEWPORT | _NEW_TRANSFORM, + .mesa = _NEW_TRANSFORM | + _NEW_VIEWPORT, .brw = BRW_NEW_BATCH, .cache = 0 }, @@ -235,8 +236,12 @@ static void upload_cc_unit(struct brw_context *brw) const struct brw_tracked_state brw_cc_unit = { .dirty = { - .mesa = _NEW_STENCIL | _NEW_COLOR | _NEW_DEPTH | _NEW_BUFFERS, - .brw = BRW_NEW_BATCH | BRW_NEW_STATS_WM, + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_DEPTH | + _NEW_STENCIL, + .brw = BRW_NEW_BATCH | + BRW_NEW_STATS_WM, .cache = CACHE_NEW_CC_VP }, .emit = upload_cc_unit, diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index d6ccfa42fa2..debeee5ccc9 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/src/mesa/drivers/dri/i965/brw_clip.c @@ -258,13 +258,13 @@ brw_upload_clip_prog(struct brw_context *brw) const struct brw_tracked_state brw_clip_prog = { .dirty = { - .mesa = (_NEW_LIGHT | - _NEW_TRANSFORM | - _NEW_POLYGON | - _NEW_BUFFERS), - .brw = (BRW_NEW_REDUCED_PRIMITIVE | - BRW_NEW_VUE_MAP_GEOM_OUT | - BRW_NEW_INTERPOLATION_MAP) + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_POLYGON | + _NEW_TRANSFORM, + .brw = BRW_NEW_INTERPOLATION_MAP | + BRW_NEW_REDUCED_PRIMITIVE | + BRW_NEW_VUE_MAP_GEOM_OUT, }, .emit = brw_upload_clip_prog }; diff --git a/src/mesa/drivers/dri/i965/brw_clip_state.c b/src/mesa/drivers/dri/i965/brw_clip_state.c index 0d153c00143..a1f2e3338cb 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_state.c +++ b/src/mesa/drivers/dri/i965/brw_clip_state.c @@ -163,11 +163,13 @@ brw_upload_clip_unit(struct brw_context *brw) const struct brw_tracked_state brw_clip_unit = { .dirty = { - .mesa = _NEW_TRANSFORM | _NEW_BUFFERS | _NEW_VIEWPORT, - .brw = (BRW_NEW_BATCH | - BRW_NEW_PROGRAM_CACHE | - BRW_NEW_CURBE_OFFSETS | - BRW_NEW_URB_FENCE), + .mesa = _NEW_BUFFERS | + _NEW_TRANSFORM | + _NEW_VIEWPORT, + .brw = BRW_NEW_BATCH | + BRW_NEW_CURBE_OFFSETS | + BRW_NEW_PROGRAM_CACHE | + BRW_NEW_URB_FENCE, .cache = CACHE_NEW_CLIP_PROG }, .emit = brw_upload_clip_unit, diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c index fea5d332c23..56c4316effa 100644 --- a/src/mesa/drivers/dri/i965/brw_curbe.c +++ b/src/mesa/drivers/dri/i965/brw_curbe.c @@ -143,7 +143,8 @@ const struct brw_tracked_state brw_curbe_offsets = { .dirty = { .mesa = _NEW_TRANSFORM, .brw = BRW_NEW_CONTEXT, - .cache = CACHE_NEW_VS_PROG | CACHE_NEW_WM_PROG + .cache = CACHE_NEW_VS_PROG | + CACHE_NEW_WM_PROG }, .emit = calculate_curbe_offsets }; @@ -308,12 +309,12 @@ emit: const struct brw_tracked_state brw_constant_buffer = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, - .brw = (BRW_NEW_URB_FENCE | - BRW_NEW_PSP | /* Implicit - hardware requires this, not used above */ - BRW_NEW_CURBE_OFFSETS | - BRW_NEW_BATCH), - .cache = (CACHE_NEW_VS_PROG | - CACHE_NEW_WM_PROG) + .brw = BRW_NEW_BATCH | + BRW_NEW_CURBE_OFFSETS | + BRW_NEW_PSP | /* Implicit - hardware requires this, not used above */ + BRW_NEW_URB_FENCE, + .cache = CACHE_NEW_VS_PROG | + CACHE_NEW_WM_PROG }, .emit = brw_upload_constant_buffer, }; diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 5a12439e8f3..7bf91631366 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -869,7 +869,8 @@ static void brw_emit_vertices(struct brw_context *brw) const struct brw_tracked_state brw_vertices = { .dirty = { .mesa = _NEW_POLYGON, - .brw = BRW_NEW_BATCH | BRW_NEW_VERTICES, + .brw = BRW_NEW_BATCH | + BRW_NEW_VERTICES, .cache = CACHE_NEW_VS_PROG, }, .emit = brw_emit_vertices, @@ -987,7 +988,8 @@ static void brw_emit_index_buffer(struct brw_context *brw) const struct brw_tracked_state brw_index_buffer = { .dirty = { .mesa = 0, - .brw = BRW_NEW_BATCH | BRW_NEW_INDEX_BUFFER, + .brw = BRW_NEW_BATCH | + BRW_NEW_INDEX_BUFFER, .cache = 0, }, .emit = brw_emit_index_buffer, diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c index 6ca9e7f51e9..377e1faa24d 100644 --- a/src/mesa/drivers/dri/i965/brw_ff_gs.c +++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c @@ -250,9 +250,9 @@ void gen6_brw_upload_ff_gs_prog(struct brw_context *brw) const struct brw_tracked_state brw_ff_gs_prog = { .dirty = { - .mesa = (_NEW_LIGHT), - .brw = (BRW_NEW_PRIMITIVE | - BRW_NEW_TRANSFORM_FEEDBACK), + .mesa = _NEW_LIGHT, + .brw = BRW_NEW_PRIMITIVE | + BRW_NEW_TRANSFORM_FEEDBACK, .cache = CACHE_NEW_VS_PROG }, .emit = brw_upload_ff_gs_prog diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index d51500effba..4b61646acfa 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -364,10 +364,12 @@ brw_upload_gs_prog(struct brw_context *brw) const struct brw_tracked_state brw_gs_prog = { .dirty = { - .mesa = (_NEW_LIGHT | _NEW_BUFFERS | _NEW_TEXTURE), - .brw = (BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_VUE_MAP_VS | - BRW_NEW_TRANSFORM_FEEDBACK), + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_TEXTURE, + .brw = BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_TRANSFORM_FEEDBACK | + BRW_NEW_VUE_MAP_VS, }, .emit = brw_upload_gs_prog }; diff --git a/src/mesa/drivers/dri/i965/brw_gs_state.c b/src/mesa/drivers/dri/i965/brw_gs_state.c index d0c92fafd0b..698f7eedfdb 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_state.c @@ -91,10 +91,10 @@ brw_upload_gs_unit(struct brw_context *brw) const struct brw_tracked_state brw_gs_unit = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_PROGRAM_CACHE | - BRW_NEW_CURBE_OFFSETS | - BRW_NEW_URB_FENCE), + .brw = BRW_NEW_BATCH | + BRW_NEW_CURBE_OFFSETS | + BRW_NEW_PROGRAM_CACHE | + BRW_NEW_URB_FENCE, .cache = CACHE_NEW_FF_GS_PROG }, .emit = brw_upload_gs_unit, diff --git a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c index 2c2ba56b6af..34505994af7 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c @@ -56,8 +56,9 @@ brw_upload_gs_pull_constants(struct brw_context *brw) const struct brw_tracked_state brw_gs_pull_constants = { .dirty = { - .mesa = (_NEW_PROGRAM_CONSTANTS), - .brw = (BRW_NEW_BATCH | BRW_NEW_GEOMETRY_PROGRAM), + .mesa = _NEW_PROGRAM_CONSTANTS, + .brw = BRW_NEW_BATCH | + BRW_NEW_GEOMETRY_PROGRAM, .cache = CACHE_NEW_GS_PROG, }, .emit = brw_upload_gs_pull_constants, @@ -83,7 +84,8 @@ brw_upload_gs_ubo_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_gs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_UNIFORM_BUFFER, + .brw = BRW_NEW_BATCH | + BRW_NEW_UNIFORM_BUFFER, .cache = CACHE_NEW_GS_PROG, }, .emit = brw_upload_gs_ubo_surfaces, @@ -107,7 +109,8 @@ brw_upload_gs_abo_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_gs_abo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_ATOMIC_BUFFER, + .brw = BRW_NEW_ATOMIC_BUFFER | + BRW_NEW_BATCH, .cache = CACHE_NEW_GS_PROG, }, .emit = brw_upload_gs_abo_surfaces, diff --git a/src/mesa/drivers/dri/i965/brw_interpolation_map.c b/src/mesa/drivers/dri/i965/brw_interpolation_map.c index e700108d95e..8ab17aaa505 100644 --- a/src/mesa/drivers/dri/i965/brw_interpolation_map.c +++ b/src/mesa/drivers/dri/i965/brw_interpolation_map.c @@ -105,8 +105,8 @@ brw_setup_vue_interpolation(struct brw_context *brw) const struct brw_tracked_state brw_interpolation_map = { .dirty = { .mesa = _NEW_LIGHT, - .brw = (BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_VUE_MAP_GEOM_OUT) + .brw = BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_VUE_MAP_GEOM_OUT, }, .emit = brw_setup_vue_interpolation }; diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 2c408148ad8..a6b3e9f05f6 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -116,16 +116,16 @@ static void upload_psp_urb_cbs(struct brw_context *brw ) const struct brw_tracked_state brw_psp_urb_cbs = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_URB_FENCE | - BRW_NEW_BATCH | - BRW_NEW_STATE_BASE_ADDRESS), - .cache = (CACHE_NEW_VS_UNIT | - CACHE_NEW_FF_GS_UNIT | - CACHE_NEW_FF_GS_PROG | - CACHE_NEW_CLIP_UNIT | - CACHE_NEW_SF_UNIT | - CACHE_NEW_WM_UNIT | - CACHE_NEW_CC_UNIT) + .brw = BRW_NEW_BATCH | + BRW_NEW_STATE_BASE_ADDRESS | + BRW_NEW_URB_FENCE, + .cache = CACHE_NEW_CC_UNIT | + CACHE_NEW_CLIP_UNIT | + CACHE_NEW_FF_GS_PROG | + CACHE_NEW_FF_GS_UNIT | + CACHE_NEW_SF_UNIT | + CACHE_NEW_VS_UNIT | + CACHE_NEW_WM_UNIT, }, .emit = upload_psp_urb_cbs, }; @@ -753,8 +753,8 @@ static void upload_polygon_stipple(struct brw_context *brw) const struct brw_tracked_state brw_polygon_stipple = { .dirty = { - .mesa = (_NEW_POLYGONSTIPPLE | - _NEW_POLYGON), + .mesa = _NEW_POLYGON | + _NEW_POLYGONSTIPPLE, .brw = BRW_NEW_CONTEXT, .cache = 0 }, @@ -797,8 +797,8 @@ static void upload_polygon_stipple_offset(struct brw_context *brw) const struct brw_tracked_state brw_polygon_stipple_offset = { .dirty = { - .mesa = (_NEW_BUFFERS | - _NEW_POLYGON), + .mesa = _NEW_BUFFERS | + _NEW_POLYGON, .brw = BRW_NEW_CONTEXT, .cache = 0 }, @@ -1059,8 +1059,8 @@ static void upload_state_base_address( struct brw_context *brw ) const struct brw_tracked_state brw_state_base_address = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_PROGRAM_CACHE), + .brw = BRW_NEW_BATCH | + BRW_NEW_PROGRAM_CACHE, .cache = 0, }, .emit = upload_state_base_address diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c index ac9506ab698..625c4a5e1de 100644 --- a/src/mesa/drivers/dri/i965/brw_sf.c +++ b/src/mesa/drivers/dri/i965/brw_sf.c @@ -217,11 +217,16 @@ brw_upload_sf_prog(struct brw_context *brw) const struct brw_tracked_state brw_sf_prog = { .dirty = { - .mesa = (_NEW_HINT | _NEW_LIGHT | _NEW_POLYGON | _NEW_POINT | - _NEW_TRANSFORM | _NEW_BUFFERS | _NEW_PROGRAM), - .brw = (BRW_NEW_REDUCED_PRIMITIVE | - BRW_NEW_VUE_MAP_GEOM_OUT | - BRW_NEW_INTERPOLATION_MAP) + .mesa = _NEW_BUFFERS | + _NEW_HINT | + _NEW_LIGHT | + _NEW_POINT | + _NEW_POLYGON | + _NEW_PROGRAM | + _NEW_TRANSFORM, + .brw = BRW_NEW_INTERPOLATION_MAP | + BRW_NEW_REDUCED_PRIMITIVE | + BRW_NEW_VUE_MAP_GEOM_OUT, }, .emit = brw_upload_sf_prog }; diff --git a/src/mesa/drivers/dri/i965/brw_sf_state.c b/src/mesa/drivers/dri/i965/brw_sf_state.c index 2fecd1eaeb3..a91e87869b0 100644 --- a/src/mesa/drivers/dri/i965/brw_sf_state.c +++ b/src/mesa/drivers/dri/i965/brw_sf_state.c @@ -114,9 +114,9 @@ static void upload_sf_vp(struct brw_context *brw) const struct brw_tracked_state brw_sf_vp = { .dirty = { - .mesa = (_NEW_VIEWPORT | - _NEW_SCISSOR | - _NEW_BUFFERS), + .mesa = _NEW_BUFFERS | + _NEW_SCISSOR | + _NEW_VIEWPORT, .brw = BRW_NEW_BATCH, .cache = 0 }, @@ -297,18 +297,18 @@ static void upload_sf_unit( struct brw_context *brw ) const struct brw_tracked_state brw_sf_unit = { .dirty = { - .mesa = (_NEW_POLYGON | - _NEW_PROGRAM | - _NEW_LIGHT | - _NEW_LINE | - _NEW_POINT | - _NEW_SCISSOR | - _NEW_BUFFERS), - .brw = (BRW_NEW_BATCH | - BRW_NEW_PROGRAM_CACHE | - BRW_NEW_URB_FENCE), - .cache = (CACHE_NEW_SF_VP | - CACHE_NEW_SF_PROG) + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_LINE | + _NEW_POINT | + _NEW_POLYGON | + _NEW_PROGRAM | + _NEW_SCISSOR, + .brw = BRW_NEW_BATCH | + BRW_NEW_PROGRAM_CACHE | + BRW_NEW_URB_FENCE, + .cache = CACHE_NEW_SF_PROG | + CACHE_NEW_SF_VP, }, .emit = upload_sf_unit, }; diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c index 0f19f6a8469..33d7526ef80 100644 --- a/src/mesa/drivers/dri/i965/brw_urb.c +++ b/src/mesa/drivers/dri/i965/brw_urb.c @@ -213,8 +213,8 @@ const struct brw_tracked_state brw_recalculate_urb_fence = { .dirty = { .mesa = 0, .brw = BRW_NEW_CURBE_OFFSETS, - .cache = (CACHE_NEW_VS_PROG | - CACHE_NEW_SF_PROG) + .cache = CACHE_NEW_SF_PROG | + CACHE_NEW_VS_PROG, }, .emit = recalculate_urb_fence }; diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index bab72cb8888..1bfea3d88e6 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -512,11 +512,14 @@ static void brw_upload_vs_prog(struct brw_context *brw) */ const struct brw_tracked_state brw_vs_prog = { .dirty = { - .mesa = (_NEW_TRANSFORM | _NEW_POLYGON | _NEW_POINT | _NEW_LIGHT | - _NEW_TEXTURE | - _NEW_BUFFERS), - .brw = (BRW_NEW_VERTEX_PROGRAM | - BRW_NEW_VERTICES), + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_POINT | + _NEW_POLYGON | + _NEW_TEXTURE | + _NEW_TRANSFORM, + .brw = BRW_NEW_VERTEX_PROGRAM | + BRW_NEW_VERTICES, .cache = 0 }, .emit = brw_upload_vs_prog diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c index d4a171182eb..88592001d14 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_state.c @@ -187,12 +187,13 @@ brw_upload_vs_unit(struct brw_context *brw) const struct brw_tracked_state brw_vs_unit = { .dirty = { .mesa = _NEW_TRANSFORM, - .brw = (BRW_NEW_BATCH | - BRW_NEW_PROGRAM_CACHE | - BRW_NEW_CURBE_OFFSETS | - BRW_NEW_URB_FENCE | - BRW_NEW_VERTEX_PROGRAM), - .cache = CACHE_NEW_VS_PROG | CACHE_NEW_SAMPLER + .brw = BRW_NEW_BATCH | + BRW_NEW_CURBE_OFFSETS | + BRW_NEW_PROGRAM_CACHE | + BRW_NEW_URB_FENCE | + BRW_NEW_VERTEX_PROGRAM, + .cache = CACHE_NEW_SAMPLER | + CACHE_NEW_VS_PROG, }, .emit = brw_upload_vs_unit, }; diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c index 4e18c7dce23..36653be11b9 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -127,8 +127,9 @@ brw_upload_vs_pull_constants(struct brw_context *brw) const struct brw_tracked_state brw_vs_pull_constants = { .dirty = { - .mesa = (_NEW_PROGRAM_CONSTANTS), - .brw = (BRW_NEW_BATCH | BRW_NEW_VERTEX_PROGRAM), + .mesa = _NEW_PROGRAM_CONSTANTS, + .brw = BRW_NEW_BATCH | + BRW_NEW_VERTEX_PROGRAM, .cache = CACHE_NEW_VS_PROG, }, .emit = brw_upload_vs_pull_constants, @@ -153,7 +154,8 @@ brw_upload_vs_ubo_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_vs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_UNIFORM_BUFFER, + .brw = BRW_NEW_BATCH | + BRW_NEW_UNIFORM_BUFFER, .cache = CACHE_NEW_VS_PROG, }, .emit = brw_upload_vs_ubo_surfaces, @@ -177,7 +179,8 @@ brw_upload_vs_abo_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_vs_abo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_ATOMIC_BUFFER, + .brw = BRW_NEW_ATOMIC_BUFFER | + BRW_NEW_BATCH, .cache = CACHE_NEW_VS_PROG, }, .emit = brw_upload_vs_abo_surfaces, diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 34500e21eeb..29d35ccf929 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -587,21 +587,21 @@ brw_upload_wm_prog(struct brw_context *brw) const struct brw_tracked_state brw_wm_prog = { .dirty = { - .mesa = (_NEW_COLOR | - _NEW_DEPTH | - _NEW_STENCIL | - _NEW_POLYGON | - _NEW_LINE | - _NEW_HINT | - _NEW_LIGHT | - _NEW_FRAG_CLAMP | - _NEW_BUFFERS | - _NEW_TEXTURE | - _NEW_MULTISAMPLE), - .brw = (BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_REDUCED_PRIMITIVE | - BRW_NEW_VUE_MAP_GEOM_OUT | - BRW_NEW_STATS_WM) + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_DEPTH | + _NEW_FRAG_CLAMP | + _NEW_HINT | + _NEW_LIGHT | + _NEW_LINE | + _NEW_MULTISAMPLE | + _NEW_POLYGON | + _NEW_STENCIL | + _NEW_TEXTURE, + .brw = BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_REDUCED_PRIMITIVE | + BRW_NEW_STATS_WM | + BRW_NEW_VUE_MAP_GEOM_OUT, }, .emit = brw_upload_wm_prog }; diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index 233260f8109..94a0b22b4c4 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -248,20 +248,18 @@ brw_upload_wm_unit(struct brw_context *brw) const struct brw_tracked_state brw_wm_unit = { .dirty = { - .mesa = (_NEW_POLYGON | - _NEW_POLYGONSTIPPLE | - _NEW_LINE | - _NEW_COLOR | - _NEW_BUFFERS), - - .brw = (BRW_NEW_BATCH | - BRW_NEW_PROGRAM_CACHE | - BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_CURBE_OFFSETS | - BRW_NEW_STATS_WM), - - .cache = (CACHE_NEW_WM_PROG | - CACHE_NEW_SAMPLER) + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_LINE | + _NEW_POLYGON | + _NEW_POLYGONSTIPPLE, + .brw = BRW_NEW_BATCH | + BRW_NEW_CURBE_OFFSETS | + BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_PROGRAM_CACHE | + BRW_NEW_STATS_WM, + .cache = CACHE_NEW_SAMPLER | + CACHE_NEW_WM_PROG, }, .emit = brw_upload_wm_unit, }; diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index ef46dd78b9e..dfe59cf853c 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -493,8 +493,9 @@ brw_upload_wm_pull_constants(struct brw_context *brw) const struct brw_tracked_state brw_wm_pull_constants = { .dirty = { - .mesa = (_NEW_PROGRAM_CONSTANTS), - .brw = (BRW_NEW_BATCH | BRW_NEW_FRAGMENT_PROGRAM), + .mesa = _NEW_PROGRAM_CONSTANTS, + .brw = BRW_NEW_BATCH | + BRW_NEW_FRAGMENT_PROGRAM, .cache = CACHE_NEW_WM_PROG, }, .emit = brw_upload_wm_pull_constants, @@ -734,8 +735,8 @@ brw_update_renderbuffer_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_renderbuffer_surfaces = { .dirty = { - .mesa = (_NEW_COLOR | - _NEW_BUFFERS), + .mesa = _NEW_BUFFERS | + _NEW_COLOR, .brw = BRW_NEW_BATCH, .cache = 0 }, @@ -824,10 +825,10 @@ const struct brw_tracked_state brw_texture_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | - BRW_NEW_TEXTURE_BUFFER | - BRW_NEW_VERTEX_PROGRAM | + BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_FRAGMENT_PROGRAM, + BRW_NEW_TEXTURE_BUFFER | + BRW_NEW_VERTEX_PROGRAM, .cache = 0 }, .emit = brw_update_texture_surfaces, @@ -890,7 +891,8 @@ brw_upload_wm_ubo_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_wm_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_UNIFORM_BUFFER, + .brw = BRW_NEW_BATCH | + BRW_NEW_UNIFORM_BUFFER, .cache = CACHE_NEW_WM_PROG, }, .emit = brw_upload_wm_ubo_surfaces, @@ -940,7 +942,8 @@ brw_upload_wm_abo_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_wm_abo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, - .brw = BRW_NEW_BATCH | BRW_NEW_ATOMIC_BUFFER, + .brw = BRW_NEW_ATOMIC_BUFFER | + BRW_NEW_BATCH, .cache = CACHE_NEW_WM_PROG, }, .emit = brw_upload_wm_abo_surfaces, diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c b/src/mesa/drivers/dri/i965/gen6_cc.c index 4770063fe7e..5ab9fa344e3 100644 --- a/src/mesa/drivers/dri/i965/gen6_cc.c +++ b/src/mesa/drivers/dri/i965/gen6_cc.c @@ -241,10 +241,11 @@ gen6_upload_blend_state(struct brw_context *brw) const struct brw_tracked_state gen6_blend_state = { .dirty = { - .mesa = (_NEW_COLOR | - _NEW_BUFFERS | - _NEW_MULTISAMPLE), - .brw = BRW_NEW_BATCH | BRW_NEW_STATE_BASE_ADDRESS, + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_MULTISAMPLE, + .brw = BRW_NEW_BATCH | + BRW_NEW_STATE_BASE_ADDRESS, .cache = 0, }, .emit = gen6_upload_blend_state, @@ -295,8 +296,10 @@ gen6_upload_color_calc_state(struct brw_context *brw) const struct brw_tracked_state gen6_color_calc_state = { .dirty = { - .mesa = _NEW_COLOR | _NEW_STENCIL, - .brw = BRW_NEW_BATCH | BRW_NEW_STATE_BASE_ADDRESS, + .mesa = _NEW_COLOR | + _NEW_STENCIL, + .brw = BRW_NEW_BATCH | + BRW_NEW_STATE_BASE_ADDRESS, .cache = 0, }, .emit = gen6_upload_color_calc_state, diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c index ab0828135be..34341936c6f 100644 --- a/src/mesa/drivers/dri/i965/gen6_clip_state.c +++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c @@ -183,7 +183,9 @@ upload_clip_state(struct brw_context *brw) const struct brw_tracked_state gen6_clip_state = { .dirty = { - .mesa = _NEW_TRANSFORM | _NEW_LIGHT | _NEW_BUFFERS, + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_TRANSFORM, .brw = BRW_NEW_CONTEXT | BRW_NEW_META_IN_PROGRESS | BRW_NEW_RASTERIZER_DISCARD, @@ -194,7 +196,10 @@ const struct brw_tracked_state gen6_clip_state = { const struct brw_tracked_state gen7_clip_state = { .dirty = { - .mesa = _NEW_BUFFERS | _NEW_LIGHT | _NEW_POLYGON | _NEW_TRANSFORM, + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_POLYGON | + _NEW_TRANSFORM, .brw = BRW_NEW_CONTEXT | BRW_NEW_META_IN_PROGRESS | BRW_NEW_RASTERIZER_DISCARD, diff --git a/src/mesa/drivers/dri/i965/gen6_depthstencil.c b/src/mesa/drivers/dri/i965/gen6_depthstencil.c index 7b06c1e90f9..4535feb65af 100644 --- a/src/mesa/drivers/dri/i965/gen6_depthstencil.c +++ b/src/mesa/drivers/dri/i965/gen6_depthstencil.c @@ -104,8 +104,11 @@ gen6_upload_depth_stencil_state(struct brw_context *brw) const struct brw_tracked_state gen6_depth_stencil_state = { .dirty = { - .mesa = _NEW_DEPTH | _NEW_STENCIL | _NEW_BUFFERS, - .brw = BRW_NEW_BATCH | BRW_NEW_STATE_BASE_ADDRESS, + .mesa = _NEW_BUFFERS | + _NEW_DEPTH | + _NEW_STENCIL, + .brw = BRW_NEW_BATCH | + BRW_NEW_STATE_BASE_ADDRESS, .cache = 0, }, .emit = gen6_upload_depth_stencil_state, diff --git a/src/mesa/drivers/dri/i965/gen6_gs_state.c b/src/mesa/drivers/dri/i965/gen6_gs_state.c index 85eb46dbd82..aeab7541d04 100644 --- a/src/mesa/drivers/dri/i965/gen6_gs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_gs_state.c @@ -53,10 +53,11 @@ gen6_upload_gs_push_constants(struct brw_context *brw) const struct brw_tracked_state gen6_gs_push_constants = { .dirty = { - .mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS, - .brw = (BRW_NEW_BATCH | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_PUSH_CONSTANT_ALLOCATION), + .mesa = _NEW_PROGRAM_CONSTANTS | + _NEW_TRANSFORM, + .brw = BRW_NEW_BATCH | + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_PUSH_CONSTANT_ALLOCATION, .cache = CACHE_NEW_GS_PROG, }, .emit = gen6_upload_gs_push_constants, @@ -195,12 +196,14 @@ upload_gs_state(struct brw_context *brw) const struct brw_tracked_state gen6_gs_state = { .dirty = { - .mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS, - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_PUSH_CONSTANT_ALLOCATION | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_BATCH), - .cache = (CACHE_NEW_GS_PROG | CACHE_NEW_FF_GS_PROG) + .mesa = _NEW_PROGRAM_CONSTANTS | + _NEW_TRANSFORM, + .brw = BRW_NEW_BATCH | + BRW_NEW_CONTEXT | + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_PUSH_CONSTANT_ALLOCATION, + .cache = CACHE_NEW_FF_GS_PROG | + CACHE_NEW_GS_PROG, }, .emit = upload_gs_state, }; diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c index ee20c0806de..912da4d4a7e 100644 --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c @@ -203,8 +203,8 @@ static void upload_multisample_state(struct brw_context *brw) const struct brw_tracked_state gen6_multisample_state = { .dirty = { .mesa = _NEW_MULTISAMPLE, - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_NUM_SAMPLES), + .brw = BRW_NEW_CONTEXT | + BRW_NEW_NUM_SAMPLES, .cache = 0 }, .emit = upload_multisample_state diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c index 9c6c508fb73..288470a8826 100644 --- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c +++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c @@ -48,8 +48,8 @@ upload_sampler_state_pointers(struct brw_context *brw) const struct brw_tracked_state gen6_sampler_state = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_STATE_BASE_ADDRESS), + .brw = BRW_NEW_BATCH | + BRW_NEW_STATE_BASE_ADDRESS, .cache = CACHE_NEW_SAMPLER }, .emit = upload_sampler_state_pointers, diff --git a/src/mesa/drivers/dri/i965/gen6_scissor_state.c b/src/mesa/drivers/dri/i965/gen6_scissor_state.c index 6b01cd133f1..02244b374c0 100644 --- a/src/mesa/drivers/dri/i965/gen6_scissor_state.c +++ b/src/mesa/drivers/dri/i965/gen6_scissor_state.c @@ -92,7 +92,9 @@ gen6_upload_scissor_state(struct brw_context *brw) const struct brw_tracked_state gen6_scissor_state = { .dirty = { - .mesa = _NEW_SCISSOR | _NEW_BUFFERS | _NEW_VIEWPORT, + .mesa = _NEW_BUFFERS | + _NEW_SCISSOR | + _NEW_VIEWPORT, .brw = BRW_NEW_BATCH, .cache = 0, }, diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c index fd7c3958ff5..29ea4dfe06f 100644 --- a/src/mesa/drivers/dri/i965/gen6_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c @@ -434,19 +434,19 @@ upload_sf_state(struct brw_context *brw) const struct brw_tracked_state gen6_sf_state = { .dirty = { - .mesa = (_NEW_LIGHT | - _NEW_PROGRAM | - _NEW_POLYGON | - _NEW_LINE | - _NEW_SCISSOR | - _NEW_BUFFERS | - _NEW_POINT | - _NEW_MULTISAMPLE), - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_PRIMITIVE | - BRW_NEW_VUE_MAP_GEOM_OUT), + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_LINE | + _NEW_MULTISAMPLE | + _NEW_POINT | + _NEW_POLYGON | + _NEW_PROGRAM | + _NEW_SCISSOR, + .brw = BRW_NEW_CONTEXT | + BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_PRIMITIVE | + BRW_NEW_VUE_MAP_GEOM_OUT, .cache = CACHE_NEW_WM_PROG }, .emit = upload_sf_state, diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gen6_sol.c index 997db1a891f..3866a81f218 100644 --- a/src/mesa/drivers/dri/i965/gen6_sol.c +++ b/src/mesa/drivers/dri/i965/gen6_sol.c @@ -91,10 +91,10 @@ gen6_update_sol_surfaces(struct brw_context *brw) const struct brw_tracked_state gen6_sol_surface = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_VERTEX_PROGRAM | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_TRANSFORM_FEEDBACK), + .brw = BRW_NEW_BATCH | + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_VERTEX_PROGRAM | + BRW_NEW_TRANSFORM_FEEDBACK, .cache = 0 }, .emit = gen6_update_sol_surfaces, @@ -186,10 +186,10 @@ brw_gs_upload_binding_table(struct brw_context *brw) const struct brw_tracked_state gen6_gs_binding_table = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_VERTEX_PROGRAM | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_SURFACES), + .brw = BRW_NEW_BATCH | + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_VERTEX_PROGRAM | + BRW_NEW_SURFACES, .cache = 0 }, .emit = brw_gs_upload_binding_table, diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c index 46cc4cc2976..99e9d81b207 100644 --- a/src/mesa/drivers/dri/i965/gen6_urb.c +++ b/src/mesa/drivers/dri/i965/gen6_urb.c @@ -127,8 +127,11 @@ gen6_upload_urb( struct brw_context *brw ) const struct brw_tracked_state gen6_urb = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_CONTEXT | BRW_NEW_GEOMETRY_PROGRAM), - .cache = (CACHE_NEW_VS_PROG | CACHE_NEW_GS_PROG | CACHE_NEW_FF_GS_PROG), + .brw = BRW_NEW_CONTEXT | + BRW_NEW_GEOMETRY_PROGRAM, + .cache = CACHE_NEW_GS_PROG | + CACHE_NEW_VS_PROG | + CACHE_NEW_FF_GS_PROG, }, .emit = gen6_upload_urb, }; diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c b/src/mesa/drivers/dri/i965/gen6_viewport_state.c index 0c5de0a2f38..0d5284d704f 100644 --- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c @@ -111,7 +111,8 @@ gen6_upload_sf_vp(struct brw_context *brw) const struct brw_tracked_state gen6_sf_vp = { .dirty = { - .mesa = _NEW_VIEWPORT | _NEW_BUFFERS, + .mesa = _NEW_BUFFERS | + _NEW_VIEWPORT, .brw = BRW_NEW_BATCH, .cache = 0, }, @@ -134,11 +135,11 @@ static void upload_viewport_state_pointers(struct brw_context *brw) const struct brw_tracked_state gen6_viewport_state = { .dirty = { .mesa = 0, - .brw = (BRW_NEW_BATCH | - BRW_NEW_STATE_BASE_ADDRESS), - .cache = (CACHE_NEW_CLIP_VP | - CACHE_NEW_SF_VP | - CACHE_NEW_CC_VP) + .brw = BRW_NEW_BATCH | + BRW_NEW_STATE_BASE_ADDRESS, + .cache = CACHE_NEW_CC_VP | + CACHE_NEW_CLIP_VP | + CACHE_NEW_SF_VP, }, .emit = upload_viewport_state_pointers, }; diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c index 1de3c261b7d..573c8041301 100644 --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c @@ -147,10 +147,11 @@ gen6_upload_vs_push_constants(struct brw_context *brw) const struct brw_tracked_state gen6_vs_push_constants = { .dirty = { - .mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS, - .brw = (BRW_NEW_BATCH | - BRW_NEW_VERTEX_PROGRAM | - BRW_NEW_PUSH_CONSTANT_ALLOCATION), + .mesa = _NEW_PROGRAM_CONSTANTS | + _NEW_TRANSFORM, + .brw = BRW_NEW_BATCH | + BRW_NEW_PUSH_CONSTANT_ALLOCATION | + BRW_NEW_VERTEX_PROGRAM, .cache = CACHE_NEW_VS_PROG, }, .emit = gen6_upload_vs_push_constants, @@ -259,11 +260,12 @@ upload_vs_state(struct brw_context *brw) const struct brw_tracked_state gen6_vs_state = { .dirty = { - .mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS, - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_VERTEX_PROGRAM | - BRW_NEW_BATCH | - BRW_NEW_PUSH_CONSTANT_ALLOCATION), + .mesa = _NEW_PROGRAM_CONSTANTS | + _NEW_TRANSFORM, + .brw = BRW_NEW_BATCH | + BRW_NEW_CONTEXT | + BRW_NEW_PUSH_CONSTANT_ALLOCATION | + BRW_NEW_VERTEX_PROGRAM, .cache = CACHE_NEW_VS_PROG }, .emit = upload_vs_state, diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c index c6c7f22e859..ea4e64eae01 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -57,9 +57,9 @@ gen6_upload_wm_push_constants(struct brw_context *brw) const struct brw_tracked_state gen6_wm_push_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, - .brw = (BRW_NEW_BATCH | - BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_PUSH_CONSTANT_ALLOCATION), + .brw = BRW_NEW_BATCH | + BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_PUSH_CONSTANT_ALLOCATION, .cache = CACHE_NEW_WM_PROG, }, .emit = gen6_upload_wm_push_constants, @@ -297,16 +297,16 @@ upload_wm_state(struct brw_context *brw) const struct brw_tracked_state gen6_wm_state = { .dirty = { - .mesa = (_NEW_LINE | - _NEW_COLOR | - _NEW_BUFFERS | - _NEW_PROGRAM_CONSTANTS | - _NEW_POLYGON | - _NEW_MULTISAMPLE), - .brw = (BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_BATCH | - BRW_NEW_PUSH_CONSTANT_ALLOCATION), - .cache = (CACHE_NEW_WM_PROG) + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_LINE | + _NEW_MULTISAMPLE | + _NEW_POLYGON | + _NEW_PROGRAM_CONSTANTS, + .brw = BRW_NEW_BATCH | + BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_PUSH_CONSTANT_ALLOCATION, + .cache = CACHE_NEW_WM_PROG }, .emit = upload_wm_state, }; diff --git a/src/mesa/drivers/dri/i965/gen7_gs_state.c b/src/mesa/drivers/dri/i965/gen7_gs_state.c index 4fe1354262e..362f8733d1b 100644 --- a/src/mesa/drivers/dri/i965/gen7_gs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_gs_state.c @@ -154,9 +154,9 @@ upload_gs_state(struct brw_context *brw) const struct brw_tracked_state gen7_gs_state = { .dirty = { .mesa = _NEW_TRANSFORM, - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_BATCH), + .brw = BRW_NEW_BATCH | + BRW_NEW_CONTEXT | + BRW_NEW_GEOMETRY_PROGRAM, .cache = CACHE_NEW_GS_PROG }, .emit = upload_gs_state, diff --git a/src/mesa/drivers/dri/i965/gen7_misc_state.c b/src/mesa/drivers/dri/i965/gen7_misc_state.c index 22911bf5423..be5abf2aabb 100644 --- a/src/mesa/drivers/dri/i965/gen7_misc_state.c +++ b/src/mesa/drivers/dri/i965/gen7_misc_state.c @@ -201,7 +201,9 @@ gen7_emit_depth_stencil_hiz(struct brw_context *brw, */ const struct brw_tracked_state gen7_depthbuffer = { .dirty = { - .mesa = (_NEW_BUFFERS | _NEW_DEPTH | _NEW_STENCIL), + .mesa = _NEW_BUFFERS | + _NEW_DEPTH | + _NEW_STENCIL, .brw = BRW_NEW_BATCH, .cache = 0, }, diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c index a1fa18ede2b..1c2c04e00c2 100644 --- a/src/mesa/drivers/dri/i965/gen7_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c @@ -87,15 +87,15 @@ upload_sbe_state(struct brw_context *brw) const struct brw_tracked_state gen7_sbe_state = { .dirty = { - .mesa = (_NEW_BUFFERS | - _NEW_LIGHT | - _NEW_POINT | - _NEW_PROGRAM), - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_PRIMITIVE | - BRW_NEW_VUE_MAP_GEOM_OUT), + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_POINT | + _NEW_PROGRAM, + .brw = BRW_NEW_CONTEXT | + BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_PRIMITIVE | + BRW_NEW_VUE_MAP_GEOM_OUT, .cache = CACHE_NEW_WM_PROG }, .emit = upload_sbe_state, @@ -248,14 +248,14 @@ upload_sf_state(struct brw_context *brw) const struct brw_tracked_state gen7_sf_state = { .dirty = { - .mesa = (_NEW_LIGHT | - _NEW_PROGRAM | - _NEW_POLYGON | - _NEW_LINE | - _NEW_SCISSOR | - _NEW_BUFFERS | - _NEW_POINT | - _NEW_MULTISAMPLE), + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_LINE | + _NEW_MULTISAMPLE | + _NEW_POINT | + _NEW_POLYGON | + _NEW_PROGRAM | + _NEW_SCISSOR, .brw = BRW_NEW_CONTEXT, .cache = 0, }, diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c index 166720e6349..7e9b2850ac1 100644 --- a/src/mesa/drivers/dri/i965/gen7_sol_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c @@ -288,10 +288,10 @@ upload_sol_state(struct brw_context *brw) const struct brw_tracked_state gen7_sol_state = { .dirty = { - .mesa = (_NEW_LIGHT), - .brw = (BRW_NEW_BATCH | - BRW_NEW_VUE_MAP_GEOM_OUT | - BRW_NEW_TRANSFORM_FEEDBACK) + .mesa = _NEW_LIGHT, + .brw = BRW_NEW_BATCH | + BRW_NEW_VUE_MAP_GEOM_OUT | + BRW_NEW_TRANSFORM_FEEDBACK, }, .emit = upload_sol_state, }; diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c index eb3784a846b..62b37f85912 100644 --- a/src/mesa/drivers/dri/i965/gen7_urb.c +++ b/src/mesa/drivers/dri/i965/gen7_urb.c @@ -314,8 +314,10 @@ gen7_emit_urb_state(struct brw_context *brw, const struct brw_tracked_state gen7_urb = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CONTEXT | BRW_NEW_GEOMETRY_PROGRAM, - .cache = (CACHE_NEW_VS_PROG | CACHE_NEW_GS_PROG), + .brw = BRW_NEW_CONTEXT | + BRW_NEW_GEOMETRY_PROGRAM, + .cache = CACHE_NEW_VS_PROG | + CACHE_NEW_GS_PROG, }, .emit = gen7_upload_urb, }; diff --git a/src/mesa/drivers/dri/i965/gen7_viewport_state.c b/src/mesa/drivers/dri/i965/gen7_viewport_state.c index 9e235051745..193ead7853e 100644 --- a/src/mesa/drivers/dri/i965/gen7_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen7_viewport_state.c @@ -92,7 +92,8 @@ gen7_upload_sf_clip_viewport(struct brw_context *brw) const struct brw_tracked_state gen7_sf_clip_viewport = { .dirty = { - .mesa = _NEW_VIEWPORT | _NEW_BUFFERS, + .mesa = _NEW_BUFFERS | + _NEW_VIEWPORT, .brw = BRW_NEW_BATCH, .cache = 0, }, diff --git a/src/mesa/drivers/dri/i965/gen7_vs_state.c b/src/mesa/drivers/dri/i965/gen7_vs_state.c index 7534de28c2e..e9144d9cd33 100644 --- a/src/mesa/drivers/dri/i965/gen7_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_vs_state.c @@ -112,9 +112,9 @@ upload_vs_state(struct brw_context *brw) const struct brw_tracked_state gen7_vs_state = { .dirty = { .mesa = _NEW_TRANSFORM, - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_VERTEX_PROGRAM | - BRW_NEW_BATCH), + .brw = BRW_NEW_BATCH | + BRW_NEW_CONTEXT | + BRW_NEW_VERTEX_PROGRAM, .cache = CACHE_NEW_VS_PROG }, .emit = upload_vs_state, diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c index 8f851d80b75..e966d7b04ee 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c @@ -126,11 +126,13 @@ upload_wm_state(struct brw_context *brw) const struct brw_tracked_state gen7_wm_state = { .dirty = { - .mesa = (_NEW_LINE | _NEW_POLYGON | - _NEW_COLOR | _NEW_BUFFERS | - _NEW_MULTISAMPLE), - .brw = (BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_BATCH), + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_LINE | + _NEW_MULTISAMPLE | + _NEW_POLYGON, + .brw = BRW_NEW_BATCH | + BRW_NEW_FRAGMENT_PROGRAM, .cache = CACHE_NEW_WM_PROG, }, .emit = upload_wm_state, @@ -270,12 +272,12 @@ upload_ps_state(struct brw_context *brw) const struct brw_tracked_state gen7_ps_state = { .dirty = { - .mesa = (_NEW_COLOR | - _NEW_BUFFERS | - _NEW_MULTISAMPLE), - .brw = (BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_BATCH), - .cache = (CACHE_NEW_WM_PROG) + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_MULTISAMPLE, + .brw = BRW_NEW_BATCH | + BRW_NEW_FRAGMENT_PROGRAM, + .cache = CACHE_NEW_WM_PROG }, .emit = upload_ps_state, }; diff --git a/src/mesa/drivers/dri/i965/gen8_blend_state.c b/src/mesa/drivers/dri/i965/gen8_blend_state.c index 9c5eedbf1b4..2e3a33a67c2 100644 --- a/src/mesa/drivers/dri/i965/gen8_blend_state.c +++ b/src/mesa/drivers/dri/i965/gen8_blend_state.c @@ -199,8 +199,11 @@ gen8_upload_blend_state(struct brw_context *brw) const struct brw_tracked_state gen8_blend_state = { .dirty = { - .mesa = _NEW_COLOR | _NEW_BUFFERS | _NEW_MULTISAMPLE, - .brw = BRW_NEW_BATCH | BRW_NEW_STATE_BASE_ADDRESS, + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_MULTISAMPLE, + .brw = BRW_NEW_BATCH | + BRW_NEW_STATE_BASE_ADDRESS, .cache = 0, }, .emit = gen8_upload_blend_state, @@ -289,8 +292,11 @@ gen8_upload_ps_blend(struct brw_context *brw) const struct brw_tracked_state gen8_ps_blend = { .dirty = { - .mesa = _NEW_BUFFERS | _NEW_COLOR | _NEW_MULTISAMPLE, - .brw = BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM, + .mesa = _NEW_BUFFERS | + _NEW_COLOR | + _NEW_MULTISAMPLE, + .brw = BRW_NEW_CONTEXT | + BRW_NEW_FRAGMENT_PROGRAM, .cache = 0, }, .emit = gen8_upload_ps_blend diff --git a/src/mesa/drivers/dri/i965/gen8_draw_upload.c b/src/mesa/drivers/dri/i965/gen8_draw_upload.c index 3189a3e83af..c3ceee1056b 100644 --- a/src/mesa/drivers/dri/i965/gen8_draw_upload.c +++ b/src/mesa/drivers/dri/i965/gen8_draw_upload.c @@ -233,7 +233,8 @@ gen8_emit_vertices(struct brw_context *brw) const struct brw_tracked_state gen8_vertices = { .dirty = { .mesa = _NEW_POLYGON, - .brw = BRW_NEW_BATCH | BRW_NEW_VERTICES, + .brw = BRW_NEW_BATCH | + BRW_NEW_VERTICES, .cache = CACHE_NEW_VS_PROG, }, .emit = gen8_emit_vertices, @@ -259,7 +260,8 @@ gen8_emit_index_buffer(struct brw_context *brw) const struct brw_tracked_state gen8_index_buffer = { .dirty = { .mesa = 0, - .brw = BRW_NEW_BATCH | BRW_NEW_INDEX_BUFFER, + .brw = BRW_NEW_BATCH | + BRW_NEW_INDEX_BUFFER, .cache = 0, }, .emit = gen8_emit_index_buffer, diff --git a/src/mesa/drivers/dri/i965/gen8_gs_state.c b/src/mesa/drivers/dri/i965/gen8_gs_state.c index 927be429747..1ca43a54de2 100644 --- a/src/mesa/drivers/dri/i965/gen8_gs_state.c +++ b/src/mesa/drivers/dri/i965/gen8_gs_state.c @@ -120,9 +120,9 @@ gen8_upload_gs_state(struct brw_context *brw) const struct brw_tracked_state gen8_gs_state = { .dirty = { .mesa = _NEW_TRANSFORM, - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_GEOMETRY_PROGRAM | - BRW_NEW_BATCH), + .brw = BRW_NEW_BATCH | + BRW_NEW_CONTEXT | + BRW_NEW_GEOMETRY_PROGRAM, .cache = CACHE_NEW_GS_PROG }, .emit = gen8_upload_gs_state, diff --git a/src/mesa/drivers/dri/i965/gen8_misc_state.c b/src/mesa/drivers/dri/i965/gen8_misc_state.c index 723d2271aa3..5c54127c20d 100644 --- a/src/mesa/drivers/dri/i965/gen8_misc_state.c +++ b/src/mesa/drivers/dri/i965/gen8_misc_state.c @@ -78,7 +78,8 @@ static void upload_state_base_address(struct brw_context *brw) const struct brw_tracked_state gen8_state_base_address = { .dirty = { .mesa = 0, - .brw = BRW_NEW_BATCH | BRW_NEW_PROGRAM_CACHE, + .brw = BRW_NEW_BATCH | + BRW_NEW_PROGRAM_CACHE, .cache = 0, }, .emit = upload_state_base_address diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c b/src/mesa/drivers/dri/i965/gen8_multisample_state.c index daf3e69b3a0..ff75df6e6ed 100644 --- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen8_multisample_state.c @@ -83,8 +83,8 @@ upload_multisample_state(struct brw_context *brw) const struct brw_tracked_state gen8_multisample_state = { .dirty = { .mesa = _NEW_MULTISAMPLE, - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_NUM_SAMPLES), + .brw = BRW_NEW_CONTEXT | + BRW_NEW_NUM_SAMPLES, .cache = 0 }, .emit = upload_multisample_state diff --git a/src/mesa/drivers/dri/i965/gen8_ps_state.c b/src/mesa/drivers/dri/i965/gen8_ps_state.c index 0c17243e3fc..ff2c9a92234 100644 --- a/src/mesa/drivers/dri/i965/gen8_ps_state.c +++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c @@ -87,7 +87,9 @@ upload_ps_extra(struct brw_context *brw) const struct brw_tracked_state gen8_ps_extra = { .dirty = { .mesa = _NEW_MULTISAMPLE, - .brw = BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_NUM_SAMPLES, + .brw = BRW_NEW_CONTEXT | + BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_NUM_SAMPLES, .cache = CACHE_NEW_WM_PROG, }, .emit = upload_ps_extra, @@ -124,7 +126,8 @@ upload_wm_state(struct brw_context *brw) const struct brw_tracked_state gen8_wm_state = { .dirty = { - .mesa = _NEW_LINE | _NEW_POLYGON, + .mesa = _NEW_LINE | + _NEW_POLYGON, .brw = BRW_NEW_CONTEXT, .cache = CACHE_NEW_WM_PROG, }, @@ -248,8 +251,8 @@ upload_ps_state(struct brw_context *brw) const struct brw_tracked_state gen8_ps_state = { .dirty = { .mesa = _NEW_MULTISAMPLE, - .brw = BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_FRAGMENT_PROGRAM, .cache = CACHE_NEW_WM_PROG }, .emit = upload_ps_state, diff --git a/src/mesa/drivers/dri/i965/gen8_sf_state.c b/src/mesa/drivers/dri/i965/gen8_sf_state.c index 6995a6a63f3..ff0081bb9b8 100644 --- a/src/mesa/drivers/dri/i965/gen8_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen8_sf_state.c @@ -127,7 +127,10 @@ upload_sbe(struct brw_context *brw) const struct brw_tracked_state gen8_sbe_state = { .dirty = { - .mesa = _NEW_BUFFERS | _NEW_LIGHT | _NEW_POINT | _NEW_PROGRAM, + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_POINT | + _NEW_PROGRAM, .brw = BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_VUE_MAP_GEOM_OUT, diff --git a/src/mesa/drivers/dri/i965/gen8_viewport_state.c b/src/mesa/drivers/dri/i965/gen8_viewport_state.c index 9c89532580c..56042d1eaf9 100644 --- a/src/mesa/drivers/dri/i965/gen8_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen8_viewport_state.c @@ -130,7 +130,8 @@ gen8_upload_sf_clip_viewport(struct brw_context *brw) const struct brw_tracked_state gen8_sf_clip_viewport = { .dirty = { - .mesa = _NEW_BUFFERS | _NEW_VIEWPORT, + .mesa = _NEW_BUFFERS | + _NEW_VIEWPORT, .brw = BRW_NEW_BATCH, .cache = 0, }, diff --git a/src/mesa/drivers/dri/i965/gen8_vs_state.c b/src/mesa/drivers/dri/i965/gen8_vs_state.c index 0cc4f0cdc5f..63d2294684b 100644 --- a/src/mesa/drivers/dri/i965/gen8_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen8_vs_state.c @@ -82,9 +82,9 @@ upload_vs_state(struct brw_context *brw) const struct brw_tracked_state gen8_vs_state = { .dirty = { .mesa = _NEW_TRANSFORM, - .brw = BRW_NEW_CONTEXT | - BRW_NEW_VERTEX_PROGRAM | - BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_CONTEXT | + BRW_NEW_VERTEX_PROGRAM, .cache = CACHE_NEW_VS_PROG }, .emit = upload_vs_state, diff --git a/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c b/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c index 38212cd3cfd..83a08c5ebb8 100644 --- a/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c +++ b/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c @@ -108,7 +108,9 @@ gen8_upload_wm_depth_stencil(struct brw_context *brw) const struct brw_tracked_state gen8_wm_depth_stencil = { .dirty = { - .mesa = _NEW_BUFFERS | _NEW_DEPTH | _NEW_STENCIL, + .mesa = _NEW_BUFFERS | + _NEW_DEPTH | + _NEW_STENCIL, .brw = BRW_NEW_CONTEXT, .cache = 0, }, |