diff options
| author | Pauli Nieminen <[email protected]> | 2009-08-25 21:46:32 +0300 |
|---|---|---|
| committer | Pauli Nieminen <[email protected]> | 2009-08-25 22:16:19 +0300 |
| commit | 5d10890795d9bddc8cafc4afb19cacf164d6e667 (patch) | |
| tree | 7108889e3fad47eb3d54d071365d53b8bf03c4b6 /src/mesa/drivers/dri | |
| parent | 87f83e193a21d7e4703664504734edd1e71920a4 (diff) | |
radeon/r600: Fix remaining warnings when building 64 bit binary.
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_cmdbuf.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_assembler.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_cmdbuf.h | 7 | ||||
| -rw-r--r-- | 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 a330d5b151c..050d7bc6d0e 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 eaacd061137..834c23593b4 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 410df4d665c..6fcd1ce7ca6 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 f15013c33b1..51f764cf473 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); } |