Mesa (master): r300/compiler: Move declaration before code.
Vinson Lee
vlee at kemper.freedesktop.org
Fri Nov 5 00:26:28 UTC 2010
Module: Mesa
Branch: master
Commit: eba2ad6de2e4310521befce6aa10e954905af329
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eba2ad6de2e4310521befce6aa10e954905af329
Author: Vinson Lee <vlee at vmware.com>
Date: Thu Nov 4 17:25:16 2010 -0700
r300/compiler: Move declaration before code.
Fixes this GCC warning with linux-x86 build.
radeon_dataflow.c: In function 'get_readers_normal_read_callback':
radeon_dataflow.c:472: warning: ISO C90 forbids mixed declarations and code
---
.../drivers/dri/r300/compiler/radeon_dataflow.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.c b/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.c
index 885e227..fd94194 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.c
@@ -465,15 +465,16 @@ static void get_readers_normal_read_callback(
{
struct get_readers_callback_data * d = userdata;
unsigned int read_mask;
+ unsigned int shared_mask;
if (src->RelAddr)
d->ReaderData->Abort = 1;
- unsigned int shared_mask = rc_src_reads_dst_mask(src->File, src->Index,
- src->Swizzle,
- d->ReaderData->Writer->U.I.DstReg.File,
- d->ReaderData->Writer->U.I.DstReg.Index,
- d->AliveWriteMask);
+ shared_mask = rc_src_reads_dst_mask(src->File, src->Index,
+ src->Swizzle,
+ d->ReaderData->Writer->U.I.DstReg.File,
+ d->ReaderData->Writer->U.I.DstReg.Index,
+ d->AliveWriteMask);
if (shared_mask == RC_MASK_NONE)
return;
More information about the mesa-commit
mailing list