[Mesa-dev] [PATCH 01/10] i965: Alphabetize brw_tracked_state flags and use a consistent style.
Kenneth Graunke
kenneth at whitecape.org
Tue Nov 25 04:43:33 PST 2014
Most of the dirty flags were listed in some arbitrary order. Some used
bonus parenthesis. Some put multiple flags on one line, others put one
per line. Some used tabs instead of spaces...but only on some lines.
This patch settles on one flag per line, in alphabetical order, using
spaces instead of tabs, and sheds the unnecessary parentheses.
Sorting was mostly done with vim's visual block feature and !sort,
although I alphabetized short lists by hand; it was pretty manual.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_binding_tables.c | 23 ++++++++--------
src/mesa/drivers/dri/i965/brw_cc.c | 11 ++++++--
src/mesa/drivers/dri/i965/brw_clip.c | 14 +++++-----
src/mesa/drivers/dri/i965/brw_clip_state.c | 12 ++++----
src/mesa/drivers/dri/i965/brw_curbe.c | 15 +++++-----
src/mesa/drivers/dri/i965/brw_draw_upload.c | 6 ++--
src/mesa/drivers/dri/i965/brw_ff_gs.c | 6 ++--
src/mesa/drivers/dri/i965/brw_gs.c | 10 ++++---
src/mesa/drivers/dri/i965/brw_gs_state.c | 8 +++---
src/mesa/drivers/dri/i965/brw_gs_surface_state.c | 11 +++++---
src/mesa/drivers/dri/i965/brw_interpolation_map.c | 4 +--
src/mesa/drivers/dri/i965/brw_misc_state.c | 32 +++++++++++-----------
src/mesa/drivers/dri/i965/brw_sf.c | 15 ++++++----
src/mesa/drivers/dri/i965/brw_sf_state.c | 30 ++++++++++----------
src/mesa/drivers/dri/i965/brw_urb.c | 4 +--
src/mesa/drivers/dri/i965/brw_vs.c | 13 +++++----
src/mesa/drivers/dri/i965/brw_vs_state.c | 13 +++++----
src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 11 +++++---
src/mesa/drivers/dri/i965/brw_wm.c | 30 ++++++++++----------
src/mesa/drivers/dri/i965/brw_wm_state.c | 26 ++++++++----------
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 21 ++++++++------
src/mesa/drivers/dri/i965/gen6_cc.c | 15 ++++++----
src/mesa/drivers/dri/i965/gen6_clip_state.c | 9 ++++--
src/mesa/drivers/dri/i965/gen6_depthstencil.c | 7 +++--
src/mesa/drivers/dri/i965/gen6_gs_state.c | 23 +++++++++-------
src/mesa/drivers/dri/i965/gen6_multisample_state.c | 4 +--
src/mesa/drivers/dri/i965/gen6_sampler_state.c | 4 +--
src/mesa/drivers/dri/i965/gen6_scissor_state.c | 4 ++-
src/mesa/drivers/dri/i965/gen6_sf_state.c | 22 +++++++--------
src/mesa/drivers/dri/i965/gen6_sol.c | 16 +++++------
src/mesa/drivers/dri/i965/gen6_urb.c | 7 +++--
src/mesa/drivers/dri/i965/gen6_viewport_state.c | 13 +++++----
src/mesa/drivers/dri/i965/gen6_vs_state.c | 20 ++++++++------
src/mesa/drivers/dri/i965/gen6_wm_state.c | 26 +++++++++---------
src/mesa/drivers/dri/i965/gen7_gs_state.c | 6 ++--
src/mesa/drivers/dri/i965/gen7_misc_state.c | 4 ++-
src/mesa/drivers/dri/i965/gen7_sf_state.c | 30 ++++++++++----------
src/mesa/drivers/dri/i965/gen7_sol_state.c | 8 +++---
src/mesa/drivers/dri/i965/gen7_urb.c | 6 ++--
src/mesa/drivers/dri/i965/gen7_viewport_state.c | 3 +-
src/mesa/drivers/dri/i965/gen7_vs_state.c | 6 ++--
src/mesa/drivers/dri/i965/gen7_wm_state.c | 24 ++++++++--------
src/mesa/drivers/dri/i965/gen8_blend_state.c | 14 +++++++---
src/mesa/drivers/dri/i965/gen8_draw_upload.c | 6 ++--
src/mesa/drivers/dri/i965/gen8_gs_state.c | 6 ++--
src/mesa/drivers/dri/i965/gen8_misc_state.c | 3 +-
src/mesa/drivers/dri/i965/gen8_multisample_state.c | 4 +--
src/mesa/drivers/dri/i965/gen8_ps_state.c | 11 +++++---
src/mesa/drivers/dri/i965/gen8_sf_state.c | 5 +++-
src/mesa/drivers/dri/i965/gen8_viewport_state.c | 3 +-
src/mesa/drivers/dri/i965/gen8_vs_state.c | 6 ++--
src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c | 4 ++-
52 files changed, 355 insertions(+), 279 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c
index cb50d3b..bf99689 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 289f65b..62c9261 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 d6ccfa4..debeee5 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 0d153c0..a1f2e33 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 fea5d332..56c4316 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 5a12439..7bf9163 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 6ca9e7f..377e1fa 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 d51500e..4b61646 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 d0c92fa..698f7ee 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 2c2ba56..3450599 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 e700108..8ab17aa 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 2c40814..a6b3e9f 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 ac9506a..625c4a5 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 2fecd1e..a91e878 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 0f19f6a..33d7526 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 bab72cb..1bfea3d 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 d4a1711..8859200 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 4e18c7d..36653be 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 34500e2..29d35cc 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 233260f..94a0b22 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 ef46dd7..dfe59cf 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 4770063..5ab9fa3 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 ab08281..3434193 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 7b06c1e..4535feb 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 85eb46d..aeab754 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 ee20c08..912da4d 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 9c6c508..288470a 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 6b01cd1..02244b3 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 24d2754..de6c068 100644
--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
@@ -401,17 +401,17 @@ 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_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_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 997db1a..3866a81 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 46cc4cc2..99e9d81 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 0c5de0a..0d5284d 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 1de3c26..573c804 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 c6c7f22..ea4e64e 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 4fe1354..362f873 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 22911bf..be5abf2 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 109b825..b9197b2 100644
--- a/src/mesa/drivers/dri/i965/gen7_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c
@@ -87,13 +87,13 @@ 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_VUE_MAP_GEOM_OUT),
+ .mesa = _NEW_BUFFERS |
+ _NEW_LIGHT |
+ _NEW_POINT |
+ _NEW_PROGRAM,
+ .brw = BRW_NEW_CONTEXT |
+ BRW_NEW_FRAGMENT_PROGRAM |
+ BRW_NEW_VUE_MAP_GEOM_OUT,
.cache = CACHE_NEW_WM_PROG
},
.emit = upload_sbe_state,
@@ -246,14 +246,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 166720e..7e9b285 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 eb3784a..62b37f8 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 9e23505..193ead7 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 7534de2..e9144d9 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 8f851d8..e966d7b 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 9c5eedb..2e3a33a 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 3189a3e..c3ceee1 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 927be42..1ca43a5 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 723d227..5c54127 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 daf3e69..ff75df6 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 0c17243..ff2c9a9 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 6995a6a..ff0081b 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 9c89532..56042d1 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 0cc4f0c..63d2294 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 38212cd..83a08c5 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,
},
--
2.1.3
More information about the mesa-dev
mailing list