On Sat, Jun 12, 2010 at 4:13 PM, <marvi...@gmx.de> wrote:
> ---
> src/mesa/drivers/dri/r600/r700_assembler.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
I've pushed this one. I'm not so sure about the rest of the set.
Alex
>
> diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c
> b/src/mesa/drivers/dri/r600/r700_assembler.c
> index 70f263d..53bdf6f 100644
> --- a/src/mesa/drivers/dri/r600/r700_assembler.c
> +++ b/src/mesa/drivers/dri/r600/r700_assembler.c
> @@ -6153,7 +6153,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;
> }
>
> @@ -6272,7 +6272,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;
> }
> --
> 1.7.0.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
