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

i965: Alphabetize brw_tracked_state flags and use a consistent style.

Browse source 
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@whitecape.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Kenneth Graunke 2014-11-24 23:16:56 -08:00
parent f3b4b263c2
commit bea9b8e306
52 changed files with 359 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mesa/drivers/dri/i965/brw_binding_tables.c
View file

@ -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,

11
src/mesa/drivers/dri/i965/brw_cc.c
View file

@ -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,

14
src/mesa/drivers/dri/i965/brw_clip.c
View file

@ -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
};

12
src/mesa/drivers/dri/i965/brw_clip_state.c
View file

@ -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,

15
src/mesa/drivers/dri/i965/brw_curbe.c
View file

@ -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,
};

6
src/mesa/drivers/dri/i965/brw_draw_upload.c
View file

@ -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,

6
src/mesa/drivers/dri/i965/brw_ff_gs.c
View file

@ -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

10
src/mesa/drivers/dri/i965/brw_gs.c
View file

@ -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
};

8
src/mesa/drivers/dri/i965/brw_gs_state.c
View file

@ -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,

11
src/mesa/drivers/dri/i965/brw_gs_surface_state.c
View file

@ -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,

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

@ -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
};

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

@ -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

15
src/mesa/drivers/dri/i965/brw_sf.c
View file

@ -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
};

30
src/mesa/drivers/dri/i965/brw_sf_state.c
View file

@ -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,
};

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

@ -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
};

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

@ -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

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

@ -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,
};

11
src/mesa/drivers/dri/i965/brw_vs_surface_state.c
View file

@ -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,

30
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -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
};

26
src/mesa/drivers/dri/i965/brw_wm_state.c
View file

@ -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,
};

21
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View file

@ -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,

15
src/mesa/drivers/dri/i965/gen6_cc.c
View file

@ -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,

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

@ -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,

7
src/mesa/drivers/dri/i965/gen6_depthstencil.c
View file

@ -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,

23
src/mesa/drivers/dri/i965/gen6_gs_state.c
View file

@ -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,
};

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

@ -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

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

@ -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,

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

@ -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,
},

26
src/mesa/drivers/dri/i965/gen6_sf_state.c
View file

@ -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,

16
src/mesa/drivers/dri/i965/gen6_sol.c
View file

@ -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,

7
src/mesa/drivers/dri/i965/gen6_urb.c
View file

@ -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,
};

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

@ -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,
};

20
src/mesa/drivers/dri/i965/gen6_vs_state.c
View file

@ -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,

26
src/mesa/drivers/dri/i965/gen6_wm_state.c
View file

@ -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,
};

6
src/mesa/drivers/dri/i965/gen7_gs_state.c
View file

@ -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,

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

@ -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,
},

34
src/mesa/drivers/dri/i965/gen7_sf_state.c
View file

@ -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,
},

8
src/mesa/drivers/dri/i965/gen7_sol_state.c
View file

@ -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,
};

6
src/mesa/drivers/dri/i965/gen7_urb.c
View file

@ -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,
};

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

@ -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,
},

6
src/mesa/drivers/dri/i965/gen7_vs_state.c
View file

@ -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,

24
src/mesa/drivers/dri/i965/gen7_wm_state.c
View file

@ -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,
};

14
src/mesa/drivers/dri/i965/gen8_blend_state.c
View file

@ -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

6
src/mesa/drivers/dri/i965/gen8_draw_upload.c
View file

@ -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,

6
src/mesa/drivers/dri/i965/gen8_gs_state.c
View file

@ -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,

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

@ -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

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

@ -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

11
src/mesa/drivers/dri/i965/gen8_ps_state.c
View file

@ -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,

5
src/mesa/drivers/dri/i965/gen8_sf_state.c
View file

@ -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,

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

@ -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,
},

6
src/mesa/drivers/dri/i965/gen8_vs_state.c
View file

@ -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,

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

@ -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,
},