From: Dave Airlie <airlied@linux.ie>
Date: Sun, 22 Nov 2009 20:44:29 +0000 (+1000)
Subject: r600: hopefully fix segfault.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c3c8c40cab193e0aa0f1a42bff7b0d726df8cf9f;p=mesa.git

r600: hopefully fix segfault.
---

diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index c46dd757d0d..702add97726 100644
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -6421,6 +6421,8 @@ GLboolean RelocProgram(r700_AssemblerBase * pAsm)
     R700ShaderInstruction *        pInst;
     R700ControlFlowGenericClause * pCFInst;
 
+    plstCFmain = pAsm->CALLSTACK[0].plstCFInstructions_local;
+
     /* remove flags init if they are not used */
     if((pAsm->unCFflags & HAS_LOOPRET) == 0)
     {
@@ -6462,7 +6464,6 @@ GLboolean RelocProgram(r700_AssemblerBase * pAsm)
         pAsm->pR700Shader->uStackSize = ((pAsm->CALLSTACK[0].max + 3)>>2) + 2;
     }
 
-    plstCFmain = pAsm->CALLSTACK[0].plstCFInstructions_local;
     unCFoffset = plstCFmain->uNumOfNode;
 
     /* Reloc subs */