From 66ebfad3cd123b6e23e28bdf17cda203b7c99a30 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 26 Sep 2014 10:26:09 -0700 Subject: i965: Move CACHE_NEW_*_VP flags to BRW_NEW_*_VP. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We've been streaming these out for ages, so they basically have nothing to do with brw_state_cache.c. Saves 6 * sizeof(void *) bytes per context, as we won't have useless aux_compare/aux_free functions for them. Signed-off-by: Kenneth Graunke Reviewed-by: Kristian Høgsberg Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_context.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_context.h') diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index f7418480c36..cd1daee6064 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -184,6 +184,9 @@ enum brw_state_id { BRW_STATE_NUM_SAMPLES, BRW_STATE_TEXTURE_BUFFER, BRW_STATE_GEN4_UNIT_STATE, + BRW_STATE_CC_VP, + BRW_STATE_SF_VP, + BRW_STATE_CLIP_VP, BRW_NUM_STATE_BITS }; @@ -226,6 +229,9 @@ enum brw_state_id { #define BRW_NEW_NUM_SAMPLES (1ull << BRW_STATE_NUM_SAMPLES) #define BRW_NEW_TEXTURE_BUFFER (1ull << BRW_STATE_TEXTURE_BUFFER) #define BRW_NEW_GEN4_UNIT_STATE (1ull << BRW_STATE_GEN4_UNIT_STATE) +#define BRW_NEW_CC_VP (1ull << BRW_STATE_CC_VP) +#define BRW_NEW_SF_VP (1ull << BRW_STATE_SF_VP) +#define BRW_NEW_CLIP_VP (1ull << BRW_STATE_CLIP_VP) struct brw_state_flags { /** State update flags signalled by mesa internals */ @@ -685,16 +691,13 @@ struct brw_gs_prog_data #define SHADER_TIME_STRIDE 64 enum brw_cache_id { - BRW_CC_VP, BRW_WM_PROG, BRW_BLORP_BLIT_PROG, BRW_SAMPLER, BRW_SF_PROG, - BRW_SF_VP, BRW_VS_PROG, BRW_FF_GS_PROG, BRW_GS_PROG, - BRW_CLIP_VP, BRW_CLIP_PROG, BRW_MAX_CACHE @@ -773,16 +776,13 @@ enum shader_time_shader_type { /* Flags for brw->state.cache. */ -#define CACHE_NEW_CC_VP (1<