r600 : change shader pop method for now.

diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index 16ac920f293125ff709d50f35a5ca2288296864a..e3bc46802f5b68415490fa4d282f47182a0604c3 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -39,7 +39,7 @@
 #include "r700_assembler.h"
 
 #define USE_CF_FOR_CONTINUE_BREAK 1
-#define USE_CF_FOR_POP_AFTER      1
+//#define USE_CF_FOR_POP_AFTER      1
 
 BITS addrmode_PVSDST(PVSDST * pPVSDST)
 {
@@ -4983,30 +4983,30 @@ GLboolean assemble_EXPORT(r700_AssemblerBase *pAsm)
 
 inline void checkStackDepth(r700_AssemblerBase *pAsm, GLuint uReason)
 {
-    switch (uReason)\r
-    {\r
-    case FC_PUSH_VPM:\r
-        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs++;\r
-        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.current++;\r
-        break;\r
-    case FC_PUSH_WQM:\r
-        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs++;\r
-        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.current += 4;\r
-        break;\r
-    case FC_LOOP:\r
-        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs += 4;\r
-        break;\r
-    case FC_REP:\r
-        /* TODO : for 16 vp asic, should += 2; */\r
-        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs += 1;\r
-        break;\r
-    };\r
-\r
-    if(pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs\r
-         > pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.max)\r
-    {\r
-        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.max =\r
-            pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs;\r
+    switch (uReason)
+    {
+    case FC_PUSH_VPM:
+        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs++;
+        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.current++;
+        break;
+    case FC_PUSH_WQM:
+        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs++;
+        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.current += 4;
+        break;
+    case FC_LOOP:
+        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs += 4;
+        break;
+    case FC_REP:
+        /* TODO : for 16 vp asic, should += 2; */
+        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs += 1;
+        break;
+    };
+
+    if(pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs
+         > pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.max)
+    {
+        pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.max =
+            pAsm->CALLSTACK[pAsm->CALLSP].stackUsage.su.pushs;
     }
 }
 
@@ -5657,8 +5657,8 @@ GLboolean testFlag(r700_AssemblerBase *pAsm)
     {
         return GL_FALSE;
     }
-#endif\r
-\r
+#endif
+
     checkStackDepth(pAsm, FC_PUSH_VPM);
 
     return GL_TRUE;