From: Kenneth Graunke Date: Wed, 16 Aug 2017 20:18:26 +0000 (-0700) Subject: i965: Drop BRW_NEW_BLORP from SURFACE_STATE setup code. X-Git-Tag: android-x86-8.1-r1~10434 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b96313c0e1289b296d7;p=android-x86%2Fexternal-mesa.git i965: Drop BRW_NEW_BLORP from SURFACE_STATE setup code. BLORP invalidates the binding tables, but it doesn't destroy any of the existing SURFACE_STATE entries in the statebuffer. We can reuse those. Reviewed-by: Jason Ekstrand --- 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 bcf39a88522..99219af8ac9 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c @@ -59,7 +59,6 @@ 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, }, @@ -85,7 +84,6 @@ 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, }, @@ -109,7 +107,6 @@ 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, @@ -132,7 +129,6 @@ const struct brw_tracked_state brw_gs_image_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | - BRW_NEW_BLORP | BRW_NEW_FAST_CLEAR_COLOR | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA | 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 02f3f0e0356..72b1b809e77 100644 --- a/src/mesa/drivers/dri/i965/brw_tcs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_tcs_surface_state.c @@ -59,7 +59,6 @@ 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, }, @@ -85,7 +84,6 @@ 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, }, @@ -110,7 +108,6 @@ 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, @@ -132,7 +129,6 @@ 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_FAST_CLEAR_COLOR | BRW_NEW_IMAGE_UNITS | BRW_NEW_TCS_PROG_DATA | 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 2750487b811..83c625ff43b 100644 --- a/src/mesa/drivers/dri/i965/brw_tes_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_tes_surface_state.c @@ -59,7 +59,6 @@ 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, }, @@ -85,7 +84,6 @@ 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, }, @@ -110,7 +108,6 @@ 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, @@ -132,7 +129,6 @@ 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_FAST_CLEAR_COLOR | BRW_NEW_IMAGE_UNITS | BRW_NEW_TESS_PROGRAMS | 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 9c2184cc485..2906a927c9a 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -128,7 +128,6 @@ 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, }, @@ -150,7 +149,6 @@ 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, }, @@ -174,7 +172,6 @@ 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, @@ -197,7 +194,6 @@ const struct brw_tracked_state brw_vs_image_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | - BRW_NEW_BLORP | BRW_NEW_FAST_CLEAR_COLOR | BRW_NEW_IMAGE_UNITS | BRW_NEW_VERTEX_PROGRAM | 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 7ae982d7711..358fdb48d44 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -817,7 +817,6 @@ 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, }, @@ -1055,7 +1054,6 @@ 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, @@ -1065,7 +1063,6 @@ const struct brw_tracked_state gen6_renderbuffer_surfaces = { .dirty = { .mesa = _NEW_BUFFERS, .brw = BRW_NEW_BATCH | - BRW_NEW_BLORP | BRW_NEW_FAST_CLEAR_COLOR, }, .emit = update_renderbuffer_surfaces, @@ -1247,7 +1244,6 @@ const struct brw_tracked_state brw_texture_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | - BRW_NEW_BLORP | BRW_NEW_FAST_CLEAR_COLOR | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | @@ -1288,7 +1284,6 @@ const struct brw_tracked_state brw_cs_texture_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | - BRW_NEW_BLORP | BRW_NEW_COMPUTE_PROGRAM | BRW_NEW_FAST_CLEAR_COLOR, }, @@ -1377,7 +1372,6 @@ 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, }, @@ -1400,7 +1394,6 @@ 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, }, @@ -1454,7 +1447,6 @@ 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, }, @@ -1477,7 +1469,6 @@ 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, }, @@ -1501,7 +1492,6 @@ 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_FAST_CLEAR_COLOR | BRW_NEW_IMAGE_UNITS @@ -1687,7 +1677,6 @@ const struct brw_tracked_state brw_wm_image_surfaces = { .dirty = { .mesa = _NEW_TEXTURE, .brw = BRW_NEW_BATCH | - BRW_NEW_BLORP | BRW_NEW_FAST_CLEAR_COLOR | BRW_NEW_FRAGMENT_PROGRAM | BRW_NEW_FS_PROG_DATA | @@ -1751,8 +1740,7 @@ brw_upload_cs_work_groups_surface(struct brw_context *brw) const struct brw_tracked_state brw_cs_work_groups_surface = { .dirty = { - .brw = BRW_NEW_BLORP | - BRW_NEW_CS_PROG_DATA | + .brw = BRW_NEW_CS_PROG_DATA | BRW_NEW_CS_WORK_GROUPS }, .emit = brw_upload_cs_work_groups_surface,