diff options
| author | Kenneth Graunke <[email protected]> | 2016-04-22 01:48:56 -0700 |
|---|---|---|
| committer | Topi Pohjolainen <[email protected]> | 2016-04-23 07:09:39 +0300 |
| commit | 6d5ce1b0433f4cbc5cd88b4bfeaf4cdcba6beda8 (patch) | |
| tree | 45a830be515a1aec93b598d2eac9abf6a8e5b8cb | |
| parent | 65a5af6dd0550e93a5250582147689a1ddef9ffa (diff) | |
i965: Make all atoms to track BRW_NEW_BLORP by default
Reviewed-by: Topi Pohjolainen <[email protected]
62 files changed, 179 insertions, 46 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c index f3a0310861c..3bf2255f8f1 100644 --- a/src/mesa/drivers/dri/i965/brw_binding_tables.c +++ b/src/mesa/drivers/dri/i965/brw_binding_tables.c @@ -166,6 +166,7 @@ const struct brw_tracked_state brw_vs_binding_table = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_VS_CONSTBUF | BRW_NEW_VS_PROG_DATA | BRW_NEW_SURFACES, @@ -190,6 +191,7 @@ const struct brw_tracked_state brw_wm_binding_table = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FS_PROG_DATA | BRW_NEW_SURFACES, }, @@ -216,6 +218,7 @@ const struct brw_tracked_state brw_tcs_binding_table = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_DEFAULT_TESS_LEVELS | BRW_NEW_SURFACES | BRW_NEW_TCS_CONSTBUF | @@ -244,6 +247,7 @@ const struct brw_tracked_state brw_tes_binding_table = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_SURFACES | BRW_NEW_TES_CONSTBUF | BRW_NEW_TES_PROG_DATA, @@ -271,6 +275,7 @@ const struct brw_tracked_state brw_gs_binding_table = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GS_CONSTBUF | BRW_NEW_GS_PROG_DATA | BRW_NEW_SURFACES, @@ -425,7 +430,8 @@ gen7_reset_hw_bt_pool_offsets(struct brw_context *brw) const struct brw_tracked_state gen7_hw_binding_tables = { .dirty = { .mesa = 0, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = gen7_enable_hw_binding_tables }; @@ -460,6 +466,7 @@ const struct brw_tracked_state brw_binding_table_pointers = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_BINDING_TABLE_POINTERS | BRW_NEW_STATE_BASE_ADDRESS, }, @@ -494,6 +501,7 @@ const struct brw_tracked_state gen6_binding_table_pointers = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_BINDING_TABLE_POINTERS | BRW_NEW_STATE_BASE_ADDRESS, }, diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c index 354c73321cd..2e8f0f79e3d 100644 --- a/src/mesa/drivers/dri/i965/brw_cc.c +++ b/src/mesa/drivers/dri/i965/brw_cc.c @@ -76,7 +76,8 @@ const struct brw_tracked_state brw_cc_vp = { .dirty = { .mesa = _NEW_TRANSFORM | _NEW_VIEWPORT, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = brw_upload_cc_vp }; @@ -247,6 +248,7 @@ const struct brw_tracked_state brw_cc_unit = { _NEW_DEPTH | _NEW_STENCIL, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CC_VP | BRW_NEW_STATS_WM, }, @@ -269,7 +271,8 @@ static void upload_blend_constant_color(struct brw_context *brw) const struct brw_tracked_state brw_blend_constant_color = { .dirty = { .mesa = _NEW_COLOR, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_CONTEXT | + BRW_NEW_BLORP, }, .emit = upload_blend_constant_color }; diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index 9db35ce3467..9baaddd0ab0 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/src/mesa/drivers/dri/i965/brw_clip.c @@ -260,7 +260,8 @@ const struct brw_tracked_state brw_clip_prog = { _NEW_LIGHT | _NEW_POLYGON | _NEW_TRANSFORM, - .brw = BRW_NEW_INTERPOLATION_MAP | + .brw = BRW_NEW_BLORP | + BRW_NEW_INTERPOLATION_MAP | BRW_NEW_REDUCED_PRIMITIVE | BRW_NEW_VUE_MAP_GEOM_OUT, }, diff --git a/src/mesa/drivers/dri/i965/brw_clip_state.c b/src/mesa/drivers/dri/i965/brw_clip_state.c index dee74dba8af..39c149c9762 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_state.c +++ b/src/mesa/drivers/dri/i965/brw_clip_state.c @@ -173,6 +173,7 @@ const struct brw_tracked_state brw_clip_unit = { _NEW_TRANSFORM | _NEW_VIEWPORT, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CLIP_PROG_DATA | BRW_NEW_CURBE_OFFSETS | BRW_NEW_PROGRAM_CACHE | diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c index b777bce70c1..dfb90b18558 100644 --- a/src/mesa/drivers/dri/i965/brw_curbe.c +++ b/src/mesa/drivers/dri/i965/brw_curbe.c @@ -142,6 +142,7 @@ const struct brw_tracked_state brw_curbe_offsets = { .dirty = { .mesa = _NEW_TRANSFORM, .brw = BRW_NEW_CONTEXT | + BRW_NEW_BLORP | BRW_NEW_FS_PROG_DATA | BRW_NEW_VS_PROG_DATA, }, @@ -334,6 +335,7 @@ const struct brw_tracked_state brw_constant_buffer = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CURBE_OFFSETS | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index f781d8ba72d..58e05166506 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -904,6 +904,7 @@ const struct brw_tracked_state brw_vertices = { .dirty = { .mesa = _NEW_POLYGON, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_VERTICES | BRW_NEW_VS_PROG_DATA, }, @@ -986,7 +987,8 @@ brw_upload_indices(struct brw_context *brw) const struct brw_tracked_state brw_indices = { .dirty = { .mesa = 0, - .brw = BRW_NEW_INDICES, + .brw = BRW_NEW_BLORP | + BRW_NEW_INDICES, }, .emit = brw_upload_indices, }; @@ -1024,6 +1026,7 @@ const struct brw_tracked_state brw_index_buffer = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_INDEX_BUFFER, }, .emit = brw_emit_index_buffer, diff --git a/src/mesa/drivers/dri/i965/brw_gs_state.c b/src/mesa/drivers/dri/i965/brw_gs_state.c index f7b14066594..1757201675d 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_state.c @@ -92,6 +92,7 @@ const struct brw_tracked_state brw_gs_unit = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CURBE_OFFSETS | BRW_NEW_FF_GS_PROG_DATA | BRW_NEW_PROGRAM_CACHE | 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 aa9324164da..63b40d135b6 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c @@ -58,6 +58,7 @@ const struct brw_tracked_state brw_gs_pull_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA, }, @@ -87,6 +88,7 @@ const struct brw_tracked_state brw_gs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GS_PROG_DATA | BRW_NEW_UNIFORM_BUFFER, }, @@ -113,6 +115,7 @@ const struct brw_tracked_state brw_gs_abo_surfaces = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_ATOMIC_BUFFER | BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GS_PROG_DATA, }, .emit = brw_upload_gs_abo_surfaces, @@ -137,6 +140,7 @@ const struct brw_tracked_state brw_gs_image_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA | BRW_NEW_IMAGE_UNITS, diff --git a/src/mesa/drivers/dri/i965/brw_interpolation_map.c b/src/mesa/drivers/dri/i965/brw_interpolation_map.c index b5da6f5ea3b..0b8c1be84e0 100644 --- a/src/mesa/drivers/dri/i965/brw_interpolation_map.c +++ b/src/mesa/drivers/dri/i965/brw_interpolation_map.c @@ -105,7 +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 = BRW_NEW_BLORP | + 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 ab1a0d7255f..ae7787c67a2 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -63,7 +63,8 @@ upload_drawing_rect(struct brw_context *brw) const struct brw_tracked_state brw_drawing_rect = { .dirty = { .mesa = _NEW_BUFFERS, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = upload_drawing_rect }; @@ -118,6 +119,7 @@ const struct brw_tracked_state brw_psp_urb_cbs = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FF_GS_PROG_DATA | BRW_NEW_GEN4_UNIT_STATE | BRW_NEW_STATE_BASE_ADDRESS | @@ -704,7 +706,8 @@ brw_emit_depth_stencil_hiz(struct brw_context *brw, const struct brw_tracked_state brw_depthbuffer = { .dirty = { .mesa = _NEW_BUFFERS, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = brw_emit_depthbuffer, }; @@ -746,7 +749,8 @@ const struct brw_tracked_state brw_polygon_stipple = { .dirty = { .mesa = _NEW_POLYGON | _NEW_POLYGONSTIPPLE, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = upload_polygon_stipple }; @@ -785,7 +789,8 @@ const struct brw_tracked_state brw_polygon_stipple_offset = { .dirty = { .mesa = _NEW_BUFFERS | _NEW_POLYGON, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = upload_polygon_stipple_offset }; @@ -816,7 +821,8 @@ upload_aa_line_parameters(struct brw_context *brw) const struct brw_tracked_state brw_aa_line_parameters = { .dirty = { .mesa = _NEW_LINE, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = upload_aa_line_parameters }; @@ -856,7 +862,8 @@ upload_line_stipple(struct brw_context *brw) const struct brw_tracked_state brw_line_stipple = { .dirty = { .mesa = _NEW_LINE, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = upload_line_stipple }; @@ -1044,7 +1051,8 @@ brw_upload_invariant_state(struct brw_context *brw) const struct brw_tracked_state brw_invariant_state = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = brw_upload_invariant_state }; @@ -1165,6 +1173,7 @@ const struct brw_tracked_state brw_state_base_address = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_PROGRAM_CACHE, }, .emit = upload_state_base_address diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c index 0c3db6b0711..e329cc73b7a 100644 --- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c +++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c @@ -212,7 +212,8 @@ haswell_upload_cut_index(struct brw_context *brw) const struct brw_tracked_state haswell_cut_index = { .dirty = { .mesa = _NEW_TRANSFORM, - .brw = BRW_NEW_INDEX_BUFFER, + .brw = BRW_NEW_BLORP | + BRW_NEW_INDEX_BUFFER, }, .emit = haswell_upload_cut_index, }; diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c index 1dc7d71929c..9f56c81cce2 100644 --- a/src/mesa/drivers/dri/i965/brw_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c @@ -607,6 +607,7 @@ const struct brw_tracked_state brw_fs_samplers = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM, }, .emit = brw_upload_fs_samplers, @@ -625,6 +626,7 @@ const struct brw_tracked_state brw_vs_samplers = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_VERTEX_PROGRAM, }, .emit = brw_upload_vs_samplers, @@ -647,6 +649,7 @@ const struct brw_tracked_state brw_gs_samplers = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GEOMETRY_PROGRAM, }, .emit = brw_upload_gs_samplers, @@ -669,6 +672,7 @@ const struct brw_tracked_state brw_tcs_samplers = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TESS_PROGRAMS, }, .emit = brw_upload_tcs_samplers, @@ -691,6 +695,7 @@ const struct brw_tracked_state brw_tes_samplers = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TESS_PROGRAMS, }, .emit = brw_upload_tes_samplers, @@ -711,6 +716,7 @@ const struct brw_tracked_state brw_cs_samplers = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_COMPUTE_PROGRAM, }, .emit = brw_upload_cs_samplers, diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c index 5acbf189969..c03af8201a2 100644 --- a/src/mesa/drivers/dri/i965/brw_sf.c +++ b/src/mesa/drivers/dri/i965/brw_sf.c @@ -224,7 +224,8 @@ const struct brw_tracked_state brw_sf_prog = { _NEW_POLYGON | _NEW_PROGRAM | _NEW_TRANSFORM, - .brw = BRW_NEW_INTERPOLATION_MAP | + .brw = BRW_NEW_BLORP | + BRW_NEW_INTERPOLATION_MAP | BRW_NEW_REDUCED_PRIMITIVE | BRW_NEW_VUE_MAP_GEOM_OUT, }, diff --git a/src/mesa/drivers/dri/i965/brw_sf_state.c b/src/mesa/drivers/dri/i965/brw_sf_state.c index b126f82ebbf..8eab671966c 100644 --- a/src/mesa/drivers/dri/i965/brw_sf_state.c +++ b/src/mesa/drivers/dri/i965/brw_sf_state.c @@ -124,7 +124,8 @@ const struct brw_tracked_state brw_sf_vp = { .mesa = _NEW_BUFFERS | _NEW_SCISSOR | _NEW_VIEWPORT, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = upload_sf_vp }; @@ -312,6 +313,7 @@ const struct brw_tracked_state brw_sf_unit = { _NEW_PROGRAM | _NEW_SCISSOR, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_PROGRAM_CACHE | BRW_NEW_SF_PROG_DATA | BRW_NEW_SF_VP | diff --git a/src/mesa/drivers/dri/i965/brw_tcs_surface_state.c b/src/mesa/drivers/dri/i965/brw_tcs_surface_state.c index 28cef3ca589..164f05f023c 100644 --- a/src/mesa/drivers/dri/i965/brw_tcs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_tcs_surface_state.c @@ -58,6 +58,7 @@ const struct brw_tracked_state brw_tcs_pull_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TCS_PROG_DATA | BRW_NEW_TESS_PROGRAMS, }, @@ -87,6 +88,7 @@ const struct brw_tracked_state brw_tcs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TCS_PROG_DATA | BRW_NEW_UNIFORM_BUFFER, }, @@ -113,6 +115,7 @@ const struct brw_tracked_state brw_tcs_abo_surfaces = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_ATOMIC_BUFFER | BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TCS_PROG_DATA, }, .emit = brw_upload_tcs_abo_surfaces, @@ -136,6 +139,7 @@ brw_upload_tcs_image_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_tcs_image_surfaces = { .dirty = { .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TCS_PROG_DATA | BRW_NEW_IMAGE_UNITS | BRW_NEW_TESS_PROGRAMS, diff --git a/src/mesa/drivers/dri/i965/brw_tes_surface_state.c b/src/mesa/drivers/dri/i965/brw_tes_surface_state.c index eff1740c12f..2fa954d1d8c 100644 --- a/src/mesa/drivers/dri/i965/brw_tes_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_tes_surface_state.c @@ -58,6 +58,7 @@ const struct brw_tracked_state brw_tes_pull_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TES_PROG_DATA | BRW_NEW_TESS_PROGRAMS, }, @@ -87,6 +88,7 @@ const struct brw_tracked_state brw_tes_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TES_PROG_DATA | BRW_NEW_UNIFORM_BUFFER, }, @@ -113,6 +115,7 @@ const struct brw_tracked_state brw_tes_abo_surfaces = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_ATOMIC_BUFFER | BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TES_PROG_DATA, }, .emit = brw_upload_tes_abo_surfaces, @@ -136,6 +139,7 @@ brw_upload_tes_image_surfaces(struct brw_context *brw) const struct brw_tracked_state brw_tes_image_surfaces = { .dirty = { .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_IMAGE_UNITS | BRW_NEW_TESS_PROGRAMS | BRW_NEW_TES_PROG_DATA, diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c index a4b8d724cde..83851c1205f 100644 --- a/src/mesa/drivers/dri/i965/brw_urb.c +++ b/src/mesa/drivers/dri/i965/brw_urb.c @@ -212,7 +212,8 @@ done: const struct brw_tracked_state brw_recalculate_urb_fence = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CURBE_OFFSETS | + .brw = BRW_NEW_BLORP | + BRW_NEW_CURBE_OFFSETS | BRW_NEW_SF_PROG_DATA | BRW_NEW_VS_PROG_DATA, }, diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c index b9b97a70c44..c728f09cac7 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_state.c @@ -185,6 +185,7 @@ const struct brw_tracked_state brw_vs_unit = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CURBE_OFFSETS | BRW_NEW_PROGRAM_CACHE | BRW_NEW_SAMPLER_STATE_TABLE | 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 7e8b989ad72..1036cdab054 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -127,6 +127,7 @@ const struct brw_tracked_state brw_vs_pull_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_VERTEX_PROGRAM | BRW_NEW_VS_PROG_DATA, }, @@ -153,6 +154,7 @@ const struct brw_tracked_state brw_vs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_UNIFORM_BUFFER | BRW_NEW_VS_PROG_DATA, }, @@ -179,6 +181,7 @@ const struct brw_tracked_state brw_vs_abo_surfaces = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_ATOMIC_BUFFER | BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_VS_PROG_DATA, }, .emit = brw_upload_vs_abo_surfaces, @@ -203,6 +206,7 @@ const struct brw_tracked_state brw_vs_image_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_IMAGE_UNITS | BRW_NEW_VERTEX_PROGRAM | BRW_NEW_VS_PROG_DATA, diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index 6bf0a55e418..91b35cd681a 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -271,6 +271,7 @@ const struct brw_tracked_state brw_wm_unit = { _NEW_POLYGON | _NEW_POLYGONSTIPPLE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CURBE_OFFSETS | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | 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 f88c43ba60f..b00ebd162ac 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -542,6 +542,7 @@ const struct brw_tracked_state brw_wm_pull_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA, }, @@ -806,6 +807,7 @@ const struct brw_tracked_state brw_renderbuffer_surfaces = { .mesa = _NEW_BUFFERS | _NEW_COLOR, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FS_PROG_DATA, }, .emit = update_renderbuffer_surfaces, @@ -814,7 +816,8 @@ const struct brw_tracked_state brw_renderbuffer_surfaces = { const struct brw_tracked_state gen6_renderbuffer_surfaces = { .dirty = { .mesa = _NEW_BUFFERS, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = update_renderbuffer_surfaces, }; @@ -904,6 +907,7 @@ const struct brw_tracked_state brw_texture_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_GEOMETRY_PROGRAM | @@ -943,6 +947,7 @@ const struct brw_tracked_state brw_cs_texture_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_COMPUTE_PROGRAM, }, .emit = brw_update_cs_texture_surfaces, @@ -1033,6 +1038,7 @@ const struct brw_tracked_state brw_wm_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FS_PROG_DATA | BRW_NEW_UNIFORM_BUFFER, }, @@ -1059,6 +1065,7 @@ const struct brw_tracked_state brw_cs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CS_PROG_DATA | BRW_NEW_UNIFORM_BUFFER, }, @@ -1111,6 +1118,7 @@ const struct brw_tracked_state brw_wm_abo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_ATOMIC_BUFFER | + BRW_NEW_BLORP | BRW_NEW_BATCH | BRW_NEW_FS_PROG_DATA, }, @@ -1136,6 +1144,7 @@ const struct brw_tracked_state brw_cs_abo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_ATOMIC_BUFFER | + BRW_NEW_BLORP | BRW_NEW_BATCH | BRW_NEW_CS_PROG_DATA, }, @@ -1161,6 +1170,7 @@ const struct brw_tracked_state brw_cs_image_surfaces = { .dirty = { .mesa = _NEW_TEXTURE | _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CS_PROG_DATA | BRW_NEW_IMAGE_UNITS }, @@ -1394,6 +1404,7 @@ const struct brw_tracked_state brw_wm_image_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_IMAGE_UNITS @@ -1448,7 +1459,8 @@ brw_upload_cs_work_groups_surface(struct brw_context *brw) const struct brw_tracked_state brw_cs_work_groups_surface = { .dirty = { - .brw = BRW_NEW_CS_WORK_GROUPS + .brw = BRW_NEW_BLORP | + BRW_NEW_CS_WORK_GROUPS }, .emit = brw_upload_cs_work_groups_surface, }; diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c b/src/mesa/drivers/dri/i965/gen6_cc.c index f5a7d4d0ef6..69c8ebd0dfb 100644 --- a/src/mesa/drivers/dri/i965/gen6_cc.c +++ b/src/mesa/drivers/dri/i965/gen6_cc.c @@ -245,6 +245,7 @@ const struct brw_tracked_state gen6_blend_state = { _NEW_COLOR | _NEW_MULTISAMPLE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_STATE_BASE_ADDRESS, }, .emit = gen6_upload_blend_state, @@ -298,6 +299,7 @@ const struct brw_tracked_state gen6_color_calc_state = { .mesa = _NEW_COLOR | _NEW_STENCIL, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CC_STATE | BRW_NEW_STATE_BASE_ADDRESS, }, diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c index 004ecebc69e..5ba3a807603 100644 --- a/src/mesa/drivers/dri/i965/gen6_clip_state.c +++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c @@ -195,7 +195,8 @@ const struct brw_tracked_state gen6_clip_state = { .mesa = _NEW_BUFFERS | _NEW_LIGHT | _NEW_TRANSFORM, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FS_PROG_DATA | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_META_IN_PROGRESS | @@ -211,7 +212,8 @@ const struct brw_tracked_state gen7_clip_state = { _NEW_LIGHT | _NEW_POLYGON | _NEW_TRANSFORM, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FS_PROG_DATA | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_META_IN_PROGRESS | diff --git a/src/mesa/drivers/dri/i965/gen6_depthstencil.c b/src/mesa/drivers/dri/i965/gen6_depthstencil.c index 2c625c98403..a3de8448336 100644 --- a/src/mesa/drivers/dri/i965/gen6_depthstencil.c +++ b/src/mesa/drivers/dri/i965/gen6_depthstencil.c @@ -108,6 +108,7 @@ const struct brw_tracked_state gen6_depth_stencil_state = { _NEW_DEPTH | _NEW_STENCIL, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_STATE_BASE_ADDRESS, }, .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 eb4c58601f8..4e4b9463464 100644 --- a/src/mesa/drivers/dri/i965/gen6_gs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_gs_state.c @@ -56,6 +56,7 @@ const struct brw_tracked_state gen6_gs_push_constants = { .mesa = _NEW_PROGRAM_CONSTANTS | _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA | BRW_NEW_PUSH_CONSTANT_ALLOCATION, @@ -199,6 +200,7 @@ const struct brw_tracked_state gen6_gs_state = { .mesa = _NEW_PROGRAM_CONSTANTS | _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_FF_GS_PROG_DATA | BRW_NEW_GEOMETRY_PROGRAM | diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c index fcd313aece2..a47e3239bef 100644 --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c @@ -215,7 +215,8 @@ upload_multisample_state(struct brw_context *brw) const struct brw_tracked_state gen6_multisample_state = { .dirty = { .mesa = _NEW_MULTISAMPLE, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_NUM_SAMPLES, }, .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 9e7da587696..b5a0c92b3ba 100644 --- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c +++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c @@ -49,6 +49,7 @@ const struct brw_tracked_state gen6_sampler_state = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_SAMPLER_STATE_TABLE | BRW_NEW_STATE_BASE_ADDRESS, }, diff --git a/src/mesa/drivers/dri/i965/gen6_scissor_state.c b/src/mesa/drivers/dri/i965/gen6_scissor_state.c index a20673282f2..b03ac730a3e 100644 --- a/src/mesa/drivers/dri/i965/gen6_scissor_state.c +++ b/src/mesa/drivers/dri/i965/gen6_scissor_state.c @@ -101,7 +101,8 @@ const struct brw_tracked_state gen6_scissor_state = { .mesa = _NEW_BUFFERS | _NEW_SCISSOR | _NEW_VIEWPORT, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = gen6_upload_scissor_state, }; diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c index 4fdcb8d80e5..8b1b7eb3f8f 100644 --- a/src/mesa/drivers/dri/i965/gen6_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c @@ -445,7 +445,8 @@ const struct brw_tracked_state gen6_sf_state = { _NEW_POLYGON | _NEW_PROGRAM | _NEW_SCISSOR, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_GEOMETRY_PROGRAM | diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gen6_sol.c index 24bb4b41b1e..7da927d6af2 100644 --- a/src/mesa/drivers/dri/i965/gen6_sol.c +++ b/src/mesa/drivers/dri/i965/gen6_sol.c @@ -92,6 +92,7 @@ const struct brw_tracked_state gen6_sol_surface = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_VERTEX_PROGRAM | BRW_NEW_TRANSFORM_FEEDBACK, @@ -186,6 +187,7 @@ const struct brw_tracked_state gen6_gs_binding_table = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_VERTEX_PROGRAM | BRW_NEW_SURFACES, diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c index c7311fd0b03..1e54474e743 100644 --- a/src/mesa/drivers/dri/i965/gen6_urb.c +++ b/src/mesa/drivers/dri/i965/gen6_urb.c @@ -127,7 +127,8 @@ gen6_upload_urb( struct brw_context *brw ) const struct brw_tracked_state gen6_urb = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FF_GS_PROG_DATA | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA | diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c b/src/mesa/drivers/dri/i965/gen6_viewport_state.c index 11b9a360ced..eacffb9ba0f 100644 --- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c @@ -73,7 +73,8 @@ gen6_upload_clip_vp(struct brw_context *brw) const struct brw_tracked_state gen6_clip_vp = { .dirty = { .mesa = _NEW_VIEWPORT, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = gen6_upload_clip_vp, }; @@ -121,7 +122,8 @@ const struct brw_tracked_state gen6_sf_vp = { .dirty = { .mesa = _NEW_BUFFERS | _NEW_VIEWPORT, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = gen6_upload_sf_vp, }; @@ -143,6 +145,7 @@ const struct brw_tracked_state gen6_viewport_state = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CC_VP | BRW_NEW_CLIP_VP | BRW_NEW_SF_VP | diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c index c18610ca38c..3ae00ec29c0 100644 --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c @@ -61,6 +61,7 @@ const struct brw_tracked_state gen6_vs_push_constants = { .mesa = _NEW_PROGRAM_CONSTANTS | _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_PUSH_CONSTANT_ALLOCATION | BRW_NEW_VERTEX_PROGRAM | BRW_NEW_VS_PROG_DATA, @@ -168,6 +169,7 @@ const struct brw_tracked_state gen6_vs_state = { .mesa = _NEW_PROGRAM_CONSTANTS | _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_PUSH_CONSTANT_ALLOCATION | BRW_NEW_VERTEX_PROGRAM | diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c index d1748ba7457..335920cb20f 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -59,6 +59,7 @@ const struct brw_tracked_state gen6_wm_push_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_PUSH_CONSTANT_ALLOCATION, @@ -329,6 +330,7 @@ const struct brw_tracked_state gen6_wm_state = { _NEW_POLYGON | _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_PUSH_CONSTANT_ALLOCATION, diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index e07c05a92c1..7f484dd1586 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -194,6 +194,7 @@ const struct brw_tracked_state brw_cs_state = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CS_PROG_DATA | BRW_NEW_PUSH_CONSTANT_ALLOCATION | BRW_NEW_SAMPLER_STATE_TABLE | @@ -295,6 +296,7 @@ const struct brw_tracked_state gen7_cs_push_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_COMPUTE_PROGRAM | BRW_NEW_PUSH_CONSTANT_ALLOCATION, }, @@ -326,6 +328,7 @@ const struct brw_tracked_state brw_cs_pull_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_COMPUTE_PROGRAM | BRW_NEW_CS_PROG_DATA, }, diff --git a/src/mesa/drivers/dri/i965/gen7_ds_state.c b/src/mesa/drivers/dri/i965/gen7_ds_state.c index 30deabb06ed..2fe0d88f119 100644 --- a/src/mesa/drivers/dri/i965/gen7_ds_state.c +++ b/src/mesa/drivers/dri/i965/gen7_ds_state.c @@ -48,6 +48,7 @@ const struct brw_tracked_state gen7_tes_push_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_PUSH_CONSTANT_ALLOCATION | BRW_NEW_TESS_PROGRAMS | BRW_NEW_TES_PROG_DATA, @@ -113,6 +114,7 @@ const struct brw_tracked_state gen7_ds_state = { .dirty = { .mesa = _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_TESS_PROGRAMS | BRW_NEW_TES_PROG_DATA, diff --git a/src/mesa/drivers/dri/i965/gen7_gs_state.c b/src/mesa/drivers/dri/i965/gen7_gs_state.c index 8d6d3fe1d34..6b126fe8fdb 100644 --- a/src/mesa/drivers/dri/i965/gen7_gs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_gs_state.c @@ -155,6 +155,7 @@ const struct brw_tracked_state gen7_gs_state = { .dirty = { .mesa = _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA, diff --git a/src/mesa/drivers/dri/i965/gen7_hs_state.c b/src/mesa/drivers/dri/i965/gen7_hs_state.c index 0e2b3b2604e..4f948dc22e4 100644 --- a/src/mesa/drivers/dri/i965/gen7_hs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_hs_state.c @@ -49,6 +49,7 @@ const struct brw_tracked_state gen7_tcs_push_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_DEFAULT_TESS_LEVELS | BRW_NEW_PUSH_CONSTANT_ALLOCATION | BRW_NEW_TESS_PROGRAMS | @@ -110,6 +111,7 @@ const struct brw_tracked_state gen7_hs_state = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TCS_PROG_DATA | BRW_NEW_TESS_PROGRAMS, }, diff --git a/src/mesa/drivers/dri/i965/gen7_l3_state.c b/src/mesa/drivers/dri/i965/gen7_l3_state.c index c4babc24f43..49b59040b1c 100644 --- a/src/mesa/drivers/dri/i965/gen7_l3_state.c +++ b/src/mesa/drivers/dri/i965/gen7_l3_state.c @@ -536,6 +536,7 @@ const struct brw_tracked_state gen7_l3_state = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CS_PROG_DATA | BRW_NEW_FS_PROG_DATA | BRW_NEW_GS_PROG_DATA | diff --git a/src/mesa/drivers/dri/i965/gen7_misc_state.c b/src/mesa/drivers/dri/i965/gen7_misc_state.c index a14d4a0c50d..321c425dd47 100644 --- a/src/mesa/drivers/dri/i965/gen7_misc_state.c +++ b/src/mesa/drivers/dri/i965/gen7_misc_state.c @@ -205,7 +205,8 @@ const struct brw_tracked_state gen7_depthbuffer = { .mesa = _NEW_BUFFERS | _NEW_DEPTH | _NEW_STENCIL, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = brw_emit_depthbuffer, }; diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c index c76789fa252..7a3cc530c0a 100644 --- a/src/mesa/drivers/dri/i965/gen7_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c @@ -91,7 +91,8 @@ const struct brw_tracked_state gen7_sbe_state = { _NEW_LIGHT | _NEW_POINT | _NEW_PROGRAM, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_GEOMETRY_PROGRAM | @@ -253,7 +254,8 @@ const struct brw_tracked_state gen7_sf_state = { _NEW_POLYGON | _NEW_PROGRAM | _NEW_SCISSOR, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_PRIMITIVE, }, .emit = upload_sf_state, diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c index c44572c3438..dd52c5918f7 100644 --- a/src/mesa/drivers/dri/i965/gen7_sol_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c @@ -290,6 +290,7 @@ const struct brw_tracked_state gen7_sol_state = { .dirty = { .mesa = _NEW_LIGHT, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_VUE_MAP_GEOM_OUT | BRW_NEW_TRANSFORM_FEEDBACK, }, diff --git a/src/mesa/drivers/dri/i965/gen7_te_state.c b/src/mesa/drivers/dri/i965/gen7_te_state.c index f221307bc43..d525318f71c 100644 --- a/src/mesa/drivers/dri/i965/gen7_te_state.c +++ b/src/mesa/drivers/dri/i965/gen7_te_state.c @@ -57,7 +57,8 @@ upload_te_state(struct brw_context *brw) const struct brw_tracked_state gen7_te_state = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_TES_PROG_DATA | BRW_NEW_TESS_PROGRAMS, }, diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c index 00edbcca662..3f731df87c4 100644 --- a/src/mesa/drivers/dri/i965/gen7_urb.c +++ b/src/mesa/drivers/dri/i965/gen7_urb.c @@ -144,7 +144,8 @@ gen7_emit_push_constant_state(struct brw_context *brw, unsigned vs_size, const struct brw_tracked_state gen7_push_constant_space = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_TESS_PROGRAMS, }, @@ -417,7 +418,8 @@ gen7_emit_urb_state(struct brw_context *brw, const struct brw_tracked_state gen7_urb = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_URB_SIZE | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_TESS_PROGRAMS | diff --git a/src/mesa/drivers/dri/i965/gen7_viewport_state.c b/src/mesa/drivers/dri/i965/gen7_viewport_state.c index c75dc9964bf..34f93afdef6 100644 --- a/src/mesa/drivers/dri/i965/gen7_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen7_viewport_state.c @@ -96,7 +96,8 @@ const struct brw_tracked_state gen7_sf_clip_viewport = { .dirty = { .mesa = _NEW_BUFFERS | _NEW_VIEWPORT, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = gen7_upload_sf_clip_viewport, }; diff --git a/src/mesa/drivers/dri/i965/gen7_vs_state.c b/src/mesa/drivers/dri/i965/gen7_vs_state.c index 0daecdc9ed2..bb3179df2f7 100644 --- a/src/mesa/drivers/dri/i965/gen7_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_vs_state.c @@ -76,6 +76,7 @@ const struct brw_tracked_state gen7_vs_state = { .dirty = { .mesa = _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_VS_PROG_DATA, }, diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c index 128c77ecf0c..2c3930f4046 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c @@ -138,6 +138,7 @@ const struct brw_tracked_state gen7_wm_state = { _NEW_MULTISAMPLE | _NEW_POLYGON, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FS_PROG_DATA, }, .emit = upload_wm_state, @@ -292,6 +293,7 @@ const struct brw_tracked_state gen7_ps_state = { _NEW_COLOR | _NEW_MULTISAMPLE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA, }, diff --git a/src/mesa/drivers/dri/i965/gen8_blend_state.c b/src/mesa/drivers/dri/i965/gen8_blend_state.c index 63186bd4897..99b5e342d63 100644 --- a/src/mesa/drivers/dri/i965/gen8_blend_state.c +++ b/src/mesa/drivers/dri/i965/gen8_blend_state.c @@ -203,6 +203,7 @@ const struct brw_tracked_state gen8_blend_state = { _NEW_COLOR | _NEW_MULTISAMPLE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_STATE_BASE_ADDRESS, }, .emit = gen8_upload_blend_state, @@ -294,7 +295,8 @@ const struct brw_tracked_state gen8_ps_blend = { .mesa = _NEW_BUFFERS | _NEW_COLOR | _NEW_MULTISAMPLE, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM, }, .emit = gen8_upload_ps_blend diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c b/src/mesa/drivers/dri/i965/gen8_depth_state.c index d6a422d75de..0eb993fcd7b 100644 --- a/src/mesa/drivers/dri/i965/gen8_depth_state.c +++ b/src/mesa/drivers/dri/i965/gen8_depth_state.c @@ -383,7 +383,8 @@ const struct brw_tracked_state gen8_pma_fix = { _NEW_DEPTH | _NEW_MULTISAMPLE | _NEW_STENCIL, - .brw = BRW_NEW_FS_PROG_DATA, + .brw = BRW_NEW_BLORP | + BRW_NEW_FS_PROG_DATA, }, .emit = gen8_emit_pma_stall_workaround }; diff --git a/src/mesa/drivers/dri/i965/gen8_disable.c b/src/mesa/drivers/dri/i965/gen8_disable.c index 6e0dc32bd1e..b7598a357a1 100644 --- a/src/mesa/drivers/dri/i965/gen8_disable.c +++ b/src/mesa/drivers/dri/i965/gen8_disable.c @@ -46,7 +46,8 @@ disable_stages(struct brw_context *brw) const struct brw_tracked_state gen8_disable_stages = { .dirty = { .mesa = 0, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = disable_stages, }; diff --git a/src/mesa/drivers/dri/i965/gen8_draw_upload.c b/src/mesa/drivers/dri/i965/gen8_draw_upload.c index ff89e5f240d..fe5ed35034a 100644 --- a/src/mesa/drivers/dri/i965/gen8_draw_upload.c +++ b/src/mesa/drivers/dri/i965/gen8_draw_upload.c @@ -309,6 +309,7 @@ const struct brw_tracked_state gen8_vertices = { .dirty = { .mesa = _NEW_POLYGON, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_VERTICES | BRW_NEW_VS_PROG_DATA, }, @@ -336,6 +337,7 @@ const struct brw_tracked_state gen8_index_buffer = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_INDEX_BUFFER, }, .emit = gen8_emit_index_buffer, @@ -353,7 +355,8 @@ gen8_emit_vf_topology(struct brw_context *brw) const struct brw_tracked_state gen8_vf_topology = { .dirty = { .mesa = 0, - .brw = BRW_NEW_PRIMITIVE, + .brw = BRW_NEW_BLORP | + BRW_NEW_PRIMITIVE, }, .emit = gen8_emit_vf_topology, }; diff --git a/src/mesa/drivers/dri/i965/gen8_ds_state.c b/src/mesa/drivers/dri/i965/gen8_ds_state.c index 976e3ccdf0d..c73016897b1 100644 --- a/src/mesa/drivers/dri/i965/gen8_ds_state.c +++ b/src/mesa/drivers/dri/i965/gen8_ds_state.c @@ -105,6 +105,7 @@ const struct brw_tracked_state gen8_ds_state = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TESS_PROGRAMS | BRW_NEW_TES_PROG_DATA, }, diff --git a/src/mesa/drivers/dri/i965/gen8_gs_state.c b/src/mesa/drivers/dri/i965/gen8_gs_state.c index c3cdb2f4350..0889311ad5c 100644 --- a/src/mesa/drivers/dri/i965/gen8_gs_state.c +++ b/src/mesa/drivers/dri/i965/gen8_gs_state.c @@ -134,6 +134,7 @@ const struct brw_tracked_state gen8_gs_state = { .dirty = { .mesa = _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA, diff --git a/src/mesa/drivers/dri/i965/gen8_hs_state.c b/src/mesa/drivers/dri/i965/gen8_hs_state.c index 21f3d469553..4f8eba6cd53 100644 --- a/src/mesa/drivers/dri/i965/gen8_hs_state.c +++ b/src/mesa/drivers/dri/i965/gen8_hs_state.c @@ -82,6 +82,7 @@ const struct brw_tracked_state gen8_hs_state = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TCS_PROG_DATA | BRW_NEW_TESS_PROGRAMS, }, diff --git a/src/mesa/drivers/dri/i965/gen8_misc_state.c b/src/mesa/drivers/dri/i965/gen8_misc_state.c index b20038eaacf..13275b3c856 100644 --- a/src/mesa/drivers/dri/i965/gen8_misc_state.c +++ b/src/mesa/drivers/dri/i965/gen8_misc_state.c @@ -76,6 +76,7 @@ const struct brw_tracked_state gen8_state_base_address = { .dirty = { .mesa = 0, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_PROGRAM_CACHE, }, .emit = gen8_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 4427f15996d..e36d037d471 100644 --- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen8_multisample_state.c @@ -81,7 +81,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 = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_NUM_SAMPLES, }, .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 7dfd4bfb8de..9269a796604 100644 --- a/src/mesa/drivers/dri/i965/gen8_ps_state.c +++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c @@ -130,7 +130,8 @@ upload_ps_extra(struct brw_context *brw) const struct brw_tracked_state gen8_ps_extra = { .dirty = { .mesa = _NEW_BUFFERS | _NEW_COLOR, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_NUM_SAMPLES, @@ -177,7 +178,8 @@ const struct brw_tracked_state gen8_wm_state = { .dirty = { .mesa = _NEW_LINE | _NEW_POLYGON, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FS_PROG_DATA, }, .emit = upload_wm_state, @@ -312,6 +314,7 @@ const struct brw_tracked_state gen8_ps_state = { .dirty = { .mesa = _NEW_MULTISAMPLE, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA, }, diff --git a/src/mesa/drivers/dri/i965/gen8_sf_state.c b/src/mesa/drivers/dri/i965/gen8_sf_state.c index 5a97c1d0e90..60e8c94a7ef 100644 --- a/src/mesa/drivers/dri/i965/gen8_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen8_sf_state.c @@ -133,7 +133,8 @@ const struct brw_tracked_state gen8_sbe_state = { _NEW_LIGHT | _NEW_POINT | _NEW_PROGRAM, - .brw = BRW_NEW_CONTEXT | + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | BRW_NEW_VUE_MAP_GEOM_OUT, @@ -207,7 +208,8 @@ const struct brw_tracked_state gen8_sf_state = { _NEW_LINE | _NEW_MULTISAMPLE | _NEW_POINT, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = upload_sf, }; @@ -324,7 +326,8 @@ const struct brw_tracked_state gen8_raster_state = { _NEW_POLYGON | _NEW_SCISSOR | _NEW_TRANSFORM, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = upload_raster, }; diff --git a/src/mesa/drivers/dri/i965/gen8_sol_state.c b/src/mesa/drivers/dri/i965/gen8_sol_state.c index f30818031f4..cc39611d9e8 100644 --- a/src/mesa/drivers/dri/i965/gen8_sol_state.c +++ b/src/mesa/drivers/dri/i965/gen8_sol_state.c @@ -177,6 +177,7 @@ const struct brw_tracked_state gen8_sol_state = { .dirty = { .mesa = _NEW_LIGHT, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_TRANSFORM_FEEDBACK | 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 2692ad55999..acaee1a94e8 100644 --- a/src/mesa/drivers/dri/i965/gen8_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen8_viewport_state.c @@ -135,7 +135,8 @@ const struct brw_tracked_state gen8_sf_clip_viewport = { .dirty = { .mesa = _NEW_BUFFERS | _NEW_VIEWPORT, - .brw = BRW_NEW_BATCH, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP, }, .emit = gen8_upload_sf_clip_viewport, }; diff --git a/src/mesa/drivers/dri/i965/gen8_vs_state.c b/src/mesa/drivers/dri/i965/gen8_vs_state.c index 28f5adddf14..fd59a86b77f 100644 --- a/src/mesa/drivers/dri/i965/gen8_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen8_vs_state.c @@ -86,6 +86,7 @@ const struct brw_tracked_state gen8_vs_state = { .dirty = { .mesa = _NEW_TRANSFORM, .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_VS_PROG_DATA, }, 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 2c843b202ea..e49103c7cb5 100644 --- a/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c +++ b/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c @@ -111,7 +111,8 @@ const struct brw_tracked_state gen8_wm_depth_stencil = { .mesa = _NEW_BUFFERS | _NEW_DEPTH | _NEW_STENCIL, - .brw = BRW_NEW_CONTEXT, + .brw = BRW_NEW_BLORP | + BRW_NEW_CONTEXT, }, .emit = gen8_upload_wm_depth_stencil, }; |