Module: Mesa
Branch: master
Commit: 5d10890795d9bddc8cafc4afb19cacf164d6e667
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d10890795d9bddc8cafc4afb19cacf164d6e667
Author: Pauli Nieminen <suok...@gmail.com>
Date: Tue Aug 25 21:46:32 2009 +0300
radeon/r600: Fix remaining warnings when building 64 bit binary.
---
src/mesa/drivers/dri/r600/r600_cmdbuf.c | 2 ++
src/mesa/drivers/dri/r600/r700_assembler.c | 4 ++--
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h | 7 ++++---
src/mesa/drivers/dri/radeon/radeon_dma.c | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c
b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
index a330d5b..050d7bc 100644
--- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c
+++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
@@ -304,6 +304,7 @@ static int r600_cs_set_age(struct radeon_cs *cs) /*
-------------- */
return 0;
}
+#if 0
static void dump_cmdbuf(struct radeon_cs *cs)
{
int i;
@@ -314,6 +315,7 @@ static void dump_cmdbuf(struct radeon_cs *cs)
fprintf(stderr,"--end--\n");
}
+#endif
static int r600_cs_emit(struct radeon_cs *cs)
{
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c
b/src/mesa/drivers/dri/r600/r700_assembler.c
index eaacd06..834c235 100644
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -2132,7 +2132,7 @@ GLboolean assemble_alu_instruction(r700_AssemblerBase
*pAsm)
alu_instruction_ptr->m_Word1_OP2.f6.write_mask =
pAsm->D.dst.writew;
break;
default:
- alu_instruction_ptr->m_Word1_OP2.f6.write_mask =
SQ_SEL_MASK;
+ alu_instruction_ptr->m_Word1_OP2.f6.write_mask = 1;
//SQ_SEL_MASK;
break;
}
alu_instruction_ptr->m_Word1_OP2.f6.omod =
SQ_ALU_OMOD_OFF;
@@ -2161,7 +2161,7 @@ GLboolean assemble_alu_instruction(r700_AssemblerBase
*pAsm)
alu_instruction_ptr->m_Word1_OP2.f.write_mask =
pAsm->D.dst.writew;
break;
default:
- alu_instruction_ptr->m_Word1_OP2.f.write_mask =
SQ_SEL_MASK;
+ alu_instruction_ptr->m_Word1_OP2.f.write_mask = 1;
//SQ_SEL_MASK;
break;
}
alu_instruction_ptr->m_Word1_OP2.f.omod =
SQ_ALU_OMOD_OFF;
diff --git a/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
b/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
index 410df4d..6fcd1ce 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
+++ b/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
@@ -54,11 +54,12 @@ void rcommonBeginBatch(radeonContextPtr rmesa,
*/
#define OUT_BATCH_RELOC(data, bo, offset, rd, wd, flags) \
do { \
- if (0 && offset) { \
+ int __offset = (offset); \
+ if (0 && __offset) { \
fprintf(stderr, "(%s:%s:%d) offset : %d\n", \
- __FILE__, __FUNCTION__, __LINE__, offset); \
+ __FILE__, __FUNCTION__, __LINE__, __offset); \
} \
- radeon_cs_write_dword(b_l_rmesa->cmdbuf.cs, offset); \
+ radeon_cs_write_dword(b_l_rmesa->cmdbuf.cs, __offset); \
radeon_cs_write_reloc(b_l_rmesa->cmdbuf.cs, \
bo, rd, wd, flags); \
if (!b_l_rmesa->radeonScreen->kernel_mm) \
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c
b/src/mesa/drivers/dri/radeon/radeon_dma.c
index f15013c..51f764c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_dma.c
+++ b/src/mesa/drivers/dri/radeon/radeon_dma.c
@@ -333,7 +333,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
foreach(dma_bo, &rmesa->dma.reserved)
++reserved;
- fprintf(stderr, "%s: free %u, wait %u, reserved %u,
minimum_size: %u\n",
+ fprintf(stderr, "%s: free %zu, wait %zu, reserved %zu,
minimum_size: %zu\n",
__FUNCTION__, free, wait, reserved,
rmesa->dma.minimum_size);
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
