Module: Mesa Branch: master Commit: 2d5fd2069031de9324a135b51a369617667223e4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d5fd2069031de9324a135b51a369617667223e4
Author: Ian Romanick <ian.d.roman...@intel.com> Date: Mon Jan 20 11:08:36 2014 -0800 radeon / r200: Remove unused 'dostate' parameter This parameter hasn't been used since January 2010 (commit 29e02c7). Fixes the following warning in both radeon and r200: radeon_common.c: In function 'r200_rcommonBeginBatch': radeon_common.c:762:14: warning: unused parameter 'dostate' [-Wunused-parameter] Note that now BEGIN_BATCH and BEGIN_PATCH_NO_AUTOSTATE are identical. Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Cc: Marek Olšák <marek.ol...@amd.com> --- src/mesa/drivers/dri/radeon/radeon_cmdbuf.h | 5 ++--- src/mesa/drivers/dri/radeon/radeon_common.c | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h b/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h index efccc81..63f51c3 100644 --- a/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h +++ b/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h @@ -9,7 +9,6 @@ void rcommonDestroyCmdBuf(radeonContextPtr rmesa); void rcommonBeginBatch(radeonContextPtr rmesa, int n, - int dostate, const char *file, const char *function, int line); @@ -32,12 +31,12 @@ void rcommonBeginBatch(radeonContextPtr rmesa, * Prepare writing n dwords to the command buffer, * including producing any necessary state emits on buffer wraparound. */ -#define BEGIN_BATCH(n) rcommonBeginBatch(b_l_rmesa, n, 1, __FILE__, __FUNCTION__, __LINE__) +#define BEGIN_BATCH(n) rcommonBeginBatch(b_l_rmesa, n, __FILE__, __FUNCTION__, __LINE__) /** * Same as BEGIN_BATCH, but do not cause automatic state emits. */ -#define BEGIN_BATCH_NO_AUTOSTATE(n) rcommonBeginBatch(b_l_rmesa, n, 0, __FILE__, __FUNCTION__, __LINE__) +#define BEGIN_BATCH_NO_AUTOSTATE(n) rcommonBeginBatch(b_l_rmesa, n, __FILE__, __FUNCTION__, __LINE__) /** * Write one dword to the command buffer. diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index 7800e50..4078fdf 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -759,7 +759,6 @@ void rcommonDestroyCmdBuf(radeonContextPtr rmesa) } void rcommonBeginBatch(radeonContextPtr rmesa, int n, - int dostate, const char *file, const char *function, int line) _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit