From: Kenneth Graunke Date: Mon, 8 Jul 2013 02:17:02 +0000 (-0700) Subject: i965: Delete the BATCH_LOCALS macro. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fcb4ab6db12ec4287e5520c5148adfc2df079e19;p=mesa.git i965: Delete the BATCH_LOCALS macro. This hasn't done anything in a long time, and it's only used in a couple places...which means we couldn't use it without doing a bunch of work anyway. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h index e151eb6d281..15a9ca1e24d 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h @@ -144,10 +144,6 @@ intel_batchbuffer_advance(struct brw_context *brw) void intel_batchbuffer_cached_advance(struct brw_context *brw); -/* Here are the crusty old macros, to be removed: - */ -#define BATCH_LOCALS - #define BEGIN_BATCH(n) intel_batchbuffer_begin(brw, n, false) #define BEGIN_BATCH_BLT(n) intel_batchbuffer_begin(brw, n, true) #define OUT_BATCH(d) intel_batchbuffer_emit_dword(brw, d) diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c index 8cb8c73b076..b5857bbd5a7 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.c +++ b/src/mesa/drivers/dri/i965/intel_blit.c @@ -284,7 +284,6 @@ intelEmitCopyBlit(struct brw_context *brw, drm_intel_bo *aper_array[3]; bool dst_y_tiled = dst_tiling == I915_TILING_Y; bool src_y_tiled = src_tiling == I915_TILING_Y; - BATCH_LOCALS; if (dst_tiling != I915_TILING_NONE) { if (dst_offset & 4095) @@ -537,7 +536,6 @@ intel_miptree_set_alpha_to_one(struct brw_context *brw, uint32_t BR13, CMD; int pitch, cpp; drm_intel_bo *aper_array[2]; - BATCH_LOCALS; pitch = region->pitch; cpp = region->cpp;