From bea9b8e306e8424ffacbdfc99ca2fc91f1c9912b Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 24 Nov 2014 23:16:56 -0800 Subject: i965: Alphabetize brw_tracked_state flags and use a consistent style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Kristian Høgsberg Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_misc_state.c | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_misc_state.c') 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 -- cgit v1.2.3