From: Kenneth Graunke Date: Mon, 16 May 2011 21:17:15 +0000 (-0700) Subject: i965: Convert BRW_NEW_* dirty bits to use an enum. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d0f0d064825c457964614bee8fedcf31526a0775;p=mesa.git i965: Convert BRW_NEW_* dirty bits to use an enum. This will make it much easier to add new dirty bits. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt Reviewed-by: Chad Versace --- diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 26cd8209c65..12aae507473 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -120,32 +120,56 @@ struct brw_context; -#define BRW_NEW_URB_FENCE 0x1 -#define BRW_NEW_FRAGMENT_PROGRAM 0x2 -#define BRW_NEW_VERTEX_PROGRAM 0x4 -#define BRW_NEW_INPUT_DIMENSIONS 0x8 -#define BRW_NEW_CURBE_OFFSETS 0x10 -#define BRW_NEW_REDUCED_PRIMITIVE 0x20 -#define BRW_NEW_PRIMITIVE 0x40 -#define BRW_NEW_CONTEXT 0x80 -#define BRW_NEW_WM_INPUT_DIMENSIONS 0x100 -#define BRW_NEW_PSP 0x800 -#define BRW_NEW_WM_SURFACES 0x1000 -#define BRW_NEW_BINDING_TABLE 0x2000 -#define BRW_NEW_INDICES 0x4000 -#define BRW_NEW_VERTICES 0x8000 +enum brw_state_id { + BRW_STATE_URB_FENCE, + BRW_STATE_FRAGMENT_PROGRAM, + BRW_STATE_VERTEX_PROGRAM, + BRW_STATE_INPUT_DIMENSIONS, + BRW_STATE_CURBE_OFFSETS, + BRW_STATE_REDUCED_PRIMITIVE, + BRW_STATE_PRIMITIVE, + BRW_STATE_CONTEXT, + BRW_STATE_WM_INPUT_DIMENSIONS, + BRW_STATE_PSP, + BRW_STATE_WM_SURFACES, + BRW_STATE_BINDING_TABLE, + BRW_STATE_INDICES, + BRW_STATE_VERTICES, + BRW_STATE_BATCH, + BRW_STATE_DEPTH_BUFFER, + BRW_STATE_NR_WM_SURFACES, + BRW_STATE_NR_VS_SURFACES, + BRW_STATE_INDEX_BUFFER, + BRW_STATE_VS_CONSTBUF, + BRW_STATE_WM_CONSTBUF +}; + +#define BRW_NEW_URB_FENCE (1 << BRW_STATE_URB_FENCE) +#define BRW_NEW_FRAGMENT_PROGRAM (1 << BRW_STATE_FRAGMENT_PROGRAM) +#define BRW_NEW_VERTEX_PROGRAM (1 << BRW_STATE_VERTEX_PROGRAM) +#define BRW_NEW_INPUT_DIMENSIONS (1 << BRW_STATE_INPUT_DIMENSIONS) +#define BRW_NEW_CURBE_OFFSETS (1 << BRW_STATE_CURBE_OFFSETS) +#define BRW_NEW_REDUCED_PRIMITIVE (1 << BRW_STATE_REDUCED_PRIMITIVE) +#define BRW_NEW_PRIMITIVE (1 << BRW_STATE_PRIMITIVE) +#define BRW_NEW_CONTEXT (1 << BRW_STATE_CONTEXT) +#define BRW_NEW_WM_INPUT_DIMENSIONS (1 << BRW_STATE_WM_INPUT_DIMENSIONS) +#define BRW_NEW_PSP (1 << BRW_STATE_PSP) +#define BRW_NEW_WM_SURFACES (1 << BRW_STATE_WM_SURFACES) +#define BRW_NEW_BINDING_TABLE (1 << BRW_STATE_BINDING_TABLE) +#define BRW_NEW_INDICES (1 << BRW_STATE_INDICES) +#define BRW_NEW_VERTICES (1 << BRW_STATE_VERTICES) /** * Used for any batch entry with a relocated pointer that will be used * by any 3D rendering. */ -#define BRW_NEW_BATCH 0x10000 +#define BRW_NEW_BATCH (1 << BRW_STATE_BATCH) /** \see brw.state.depth_region */ -#define BRW_NEW_DEPTH_BUFFER 0x20000 -#define BRW_NEW_NR_WM_SURFACES 0x40000 -#define BRW_NEW_NR_VS_SURFACES 0x80000 -#define BRW_NEW_INDEX_BUFFER 0x100000 -#define BRW_NEW_VS_CONSTBUF 0x200000 -#define BRW_NEW_WM_CONSTBUF 0x400000 +#define BRW_NEW_DEPTH_BUFFER (1 << BRW_STATE_DEPTH_BUFFER) +#define BRW_NEW_NR_WM_SURFACES (1 << BRW_STATE_NR_WM_SURFACES) +#define BRW_NEW_NR_VS_SURFACES (1 << BRW_STATE_NR_VS_SURFACES) +#define BRW_NEW_INDEX_BUFFER (1 << BRW_STATE_INDEX_BUFFER) +#define BRW_NEW_VS_CONSTBUF (1 << BRW_STATE_VS_CONSTBUF) +#define BRW_NEW_WM_CONSTBUF (1 << BRW_STATE_WM_CONSTBUF) struct brw_state_flags { /** State update flags signalled by mesa internals */