Mesa (master): r600: hopefully fix segfault.
Dave Airlie
airlied at kemper.freedesktop.org
Sun Nov 22 20:44:49 UTC 2009
Module: Mesa
Branch: master
Commit: c3c8c40cab193e0aa0f1a42bff7b0d726df8cf9f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3c8c40cab193e0aa0f1a42bff7b0d726df8cf9f
Author: Dave Airlie <airlied at linux.ie>
Date: Mon Nov 23 06:44:29 2009 +1000
r600: hopefully fix segfault.
---
src/mesa/drivers/dri/r600/r700_assembler.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index c46dd75..702add9 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 */
More information about the mesa-commit
mailing list