Both brw_defines.h and intel_reg.h defined PIPE_CONTROL fields, which had similar names, but couldn't be used in the same way. (One had built-in shifts, and the other didn't...)
Delete the unused set to preserve sanity. Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> --- src/mesa/drivers/dri/i965/brw_defines.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index 2121013..aaeb964 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -38,14 +38,6 @@ /* 3D state: */ -#define PIPE_CONTROL_NOWRITE 0x00 -#define PIPE_CONTROL_WRITEIMMEDIATE 0x01 -#define PIPE_CONTROL_WRITEDEPTH 0x02 -#define PIPE_CONTROL_WRITETIMESTAMP 0x03 - -#define PIPE_CONTROL_GTTWRITE_PROCESS_LOCAL 0x00 -#define PIPE_CONTROL_GTTWRITE_GLOBAL 0x01 - #define CMD_3D_PRIM 0x7b00 /* 3DPRIMITIVE */ /* DW0 */ # define GEN4_3DPRIM_TOPOLOGY_TYPE_SHIFT 10 @@ -1911,8 +1903,6 @@ enum brw_wm_barycentric_interp_mode { /* DW2: start address */ /* DW3: end address. */ -#define CMD_PIPE_CONTROL 0x7a00 - #define CMD_MI_FLUSH 0x0200 #define GEN5_MI_REPORT_PERF_COUNT ((0x26 << 23) | (3 - 2)) -- 1.8.4.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev