OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeon/r600: Fix remaining warnings when building 64 bit binary.

Browse Source
This commit is contained in:
Pauli Nieminen
2009-08-25 21:46:32 +03:00
parent 87f83e193a
commit 5d10890795
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/r600/r600_cmdbuf.c
View File

@@ -304,6 +304,7 @@ static int r600_cs_set_age(struct radeon_cs *cs) /* -------------- */
return 0; return 0;
} }
#if 0
static void dump_cmdbuf(struct radeon_cs *cs) static void dump_cmdbuf(struct radeon_cs *cs)
{ {
int i; int i;
@@ -314,6 +315,7 @@ static void dump_cmdbuf(struct radeon_cs *cs)
fprintf(stderr,"--end--\n"); fprintf(stderr,"--end--\n");
} }
#endif
static int r600_cs_emit(struct radeon_cs *cs) static int r600_cs_emit(struct radeon_cs *cs)
{ {

4
src/mesa/drivers/dri/r600/r700_assembler.c
View File

@@ -2132,7 +2132,7 @@ GLboolean assemble_alu_instruction(r700_AssemblerBase *pAsm)
alu_instruction_ptr->m_Word1_OP2.f6.write_mask = pAsm->D.dst.writew; alu_instruction_ptr->m_Word1_OP2.f6.write_mask = pAsm->D.dst.writew;
break; break;
default: 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; break;
} }
alu_instruction_ptr->m_Word1_OP2.f6.omod = SQ_ALU_OMOD_OFF; 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; alu_instruction_ptr->m_Word1_OP2.f.write_mask = pAsm->D.dst.writew;
break; break;
default: 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; break;
} }
alu_instruction_ptr->m_Word1_OP2.f.omod = SQ_ALU_OMOD_OFF; alu_instruction_ptr->m_Word1_OP2.f.omod = SQ_ALU_OMOD_OFF;

7
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
View File

@@ -54,11 +54,12 @@ void rcommonBeginBatch(radeonContextPtr rmesa,
*/ */
#define OUT_BATCH_RELOC(data, bo, offset, rd, wd, flags) \ #define OUT_BATCH_RELOC(data, bo, offset, rd, wd, flags) \
do { \ do { \
if (0 && offset) { \ int __offset = (offset); \
if (0 && __offset) { \
fprintf(stderr, "(%s:%s:%d) offset : %d\n", \ 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, \ radeon_cs_write_reloc(b_l_rmesa->cmdbuf.cs, \
bo, rd, wd, flags); \ bo, rd, wd, flags); \
if (!b_l_rmesa->radeonScreen->kernel_mm) \ if (!b_l_rmesa->radeonScreen->kernel_mm) \

2
src/mesa/drivers/dri/radeon/radeon_dma.c
View File

@@ -333,7 +333,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
foreach(dma_bo, &rmesa->dma.reserved) foreach(dma_bo, &rmesa->dma.reserved)
++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); __FUNCTION__, free, wait, reserved, rmesa->dma.minimum_size);
} }