From 4f24c168c87e9938f35f5ec135062408148be373 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 24 Nov 2014 23:57:48 -0800 Subject: i965: Move BRW_NEW_*_PROG_DATA flags to .brw (not .cache). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I put the BRW_NEW_*_PROG_DATA flags at the beginning so that brw_state_cache.c can still continue using 1 << brw_cache_id. I also added a comment explaining the difference between BRW_NEW_*_PROG_DATA and BRW_NEW_*_PROGRAM, as it took me a long time to remember it. Non-mechanical changes: - brw_state_cache.c and brw_ff_gs.c now signal .brw, not .cache. - brw_state_upload.c - INTEL_DEBUG=state changes. - brw_context.h - bit definition merging. v2: Correct the explanation of BRW_NEW_*_PROG_DATA to mention state-based recompiles, and nix the "proper subset" claim, as it's false. (Caught by Kristian Høgsberg). Signed-off-by: Kenneth Graunke Reviewed-by: Kristian Høgsberg Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_gs_surface_state.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_gs_surface_state.c') 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 267880b..00fcc31 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c @@ -58,8 +58,8 @@ const struct brw_tracked_state brw_gs_pull_constants = { .dirty = { .mesa = _NEW_PROGRAM_CONSTANTS, .brw = BRW_NEW_BATCH | - BRW_NEW_GEOMETRY_PROGRAM, - .cache = BRW_NEW_GS_PROG_DATA, + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_GS_PROG_DATA, }, .emit = brw_upload_gs_pull_constants, }; @@ -85,8 +85,8 @@ const struct brw_tracked_state brw_gs_ubo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_BATCH | + BRW_NEW_GS_PROG_DATA | BRW_NEW_UNIFORM_BUFFER, - .cache = BRW_NEW_GS_PROG_DATA, }, .emit = brw_upload_gs_ubo_surfaces, }; @@ -110,8 +110,8 @@ const struct brw_tracked_state brw_gs_abo_surfaces = { .dirty = { .mesa = _NEW_PROGRAM, .brw = BRW_NEW_ATOMIC_BUFFER | - BRW_NEW_BATCH, - .cache = BRW_NEW_GS_PROG_DATA, + BRW_NEW_BATCH | + BRW_NEW_GS_PROG_DATA, }, .emit = brw_upload_gs_abo_surfaces, }; -- cgit v1.1