Mesa (master): r600: fix warnings

Alex Deucher agd5f at kemper.freedesktop.org
Wed Jun 16 09:47:57 PDT 2010


Module: Mesa
Branch: master
Commit: 5552dffa39d1401d20df4696540f5de2e8c852ea
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5552dffa39d1401d20df4696540f5de2e8c852ea

Author: Marc <marvin24 at gmx.de>
Date:   Wed Jun 16 12:44:02 2010 -0400

r600: fix warnings

---

 src/mesa/drivers/dri/r600/r700_assembler.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index 7b4d478..de5c5d8 100644
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -6159,7 +6159,7 @@ GLboolean callPreSub(r700_AssemblerBase* pAsm,
     }
     if(uNumValidSrc > 0)
     {
-        prelude_cf_ptr     = pAsm->cf_current_alu_clause_ptr;
+        prelude_cf_ptr     = (R700ControlFlowGenericClause*) pAsm->cf_current_alu_clause_ptr;
         pAsm->alu_x_opcode = SQ_CF_INST_ALU;
     }
 
@@ -6279,7 +6279,7 @@ GLboolean callPreSub(r700_AssemblerBase* pAsm,
 
         next_ins(pAsm);        
 
-        pAsm->callers[pAsm->unCallerArrayPointer - 1].finale_cf_ptr  = pAsm->cf_current_alu_clause_ptr;
+        pAsm->callers[pAsm->unCallerArrayPointer - 1].finale_cf_ptr  = (R700ControlFlowGenericClause*) pAsm->cf_current_alu_clause_ptr;
         pAsm->callers[pAsm->unCallerArrayPointer - 1].prelude_cf_ptr = prelude_cf_ptr;
         pAsm->alu_x_opcode = SQ_CF_INST_ALU;
     }



More information about the mesa-commit mailing list