updated some printfs, added comment about sched_yield

[mesa.git] / src / mesa / shader / slang / slang_assemble_conditional.c

diff --git a/src/mesa/shader/slang/slang_assemble_conditional.c b/src/mesa/shader/slang/slang_assemble_conditional.c
index 067a5bf941795a0f1e0016c1b18d086292ec16d8..b29d0cf30c54b076ba14fd57c7a02e34aa815254 100644 (file)
--- a/src/mesa/shader/slang/slang_assemble_conditional.c
+++ b/src/mesa/shader/slang/slang_assemble_conditional.c
@@ -29,10 +29,8 @@
  */\r
 \r
 #include "imports.h"\r
-#include "slang_utility.h"\r
-#include "slang_assemble_conditional.h"\r
 #include "slang_assemble.h"\r
-#include "slang_execute.h"\r
+#include "slang_compile.h"\r
 \r
 /*\r
  * _slang_assemble_logicaland()\r
@@ -52,7 +50,7 @@ GLboolean _slang_assemble_logicaland (slang_assemble_ctx *A, slang_operation *op
        GLuint zero_jump, end_jump;\r
 \r
        /* evaluate left expression */\r
-       if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[0], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to pushing 0 if not true */\r
@@ -61,7 +59,7 @@ GLboolean _slang_assemble_logicaland (slang_assemble_ctx *A, slang_operation *op
                return GL_FALSE;\r
 \r
        /* evaluate right expression */\r
-       if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to the end of the expression */\r
@@ -98,7 +96,7 @@ GLboolean _slang_assemble_logicalor (slang_assemble_ctx *A, slang_operation *op)
        GLuint right_jump, end_jump;\r
 \r
        /* evaluate left expression */\r
-       if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[0], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to evaluation of right expression if not true */\r
@@ -117,7 +115,7 @@ GLboolean _slang_assemble_logicalor (slang_assemble_ctx *A, slang_operation *op)
 \r
        /* evaluate right expression */\r
        A->file->code[right_jump].param[0] = A->file->count;\r
-       if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* the end of the expression */\r
@@ -144,7 +142,7 @@ GLboolean _slang_assemble_select (slang_assemble_ctx *A, slang_operation *op)
        GLuint cond_jump, end_jump;\r
 \r
        /* execute condition expression */\r
-       if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[0], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to false expression if not true */\r
@@ -153,7 +151,7 @@ GLboolean _slang_assemble_select (slang_assemble_ctx *A, slang_operation *op)
                return GL_FALSE;\r
 \r
        /* execute true expression */\r
-       if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to the end of the expression */\r
@@ -165,7 +163,7 @@ GLboolean _slang_assemble_select (slang_assemble_ctx *A, slang_operation *op)
        A->file->code[cond_jump].param[0] = A->file->count;\r
 \r
        /* execute false expression */\r
-       if (!_slang_assemble_operation_ (A, &op->children[2], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[2], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* resolve the end of the expression */\r
@@ -199,9 +197,9 @@ GLboolean _slang_assemble_for (slang_assemble_ctx *A, slang_operation *op)
        slang_assembly_flow_control save_flow = A->flow;\r
 \r
        /* execute initialization statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_forbid/*slang_ref_freelance*/))\r
+       if (!_slang_assemble_operation (A, &op->children[0], slang_ref_forbid/*slang_ref_freelance*/))\r
                return GL_FALSE;\r
-       if (!_slang_cleanup_stack_ (A, &op->children[0]))\r
+       if (!_slang_cleanup_stack (A, &op->children[0]))\r
                return GL_FALSE;\r
 \r
        /* skip the "go to the end of the loop" and loop-increment statements */\r
@@ -219,16 +217,16 @@ GLboolean _slang_assemble_for (slang_assemble_ctx *A, slang_operation *op)
        cont_label = A->file->count;\r
 \r
        /* execute loop-increment statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[2], slang_ref_forbid/*slang_ref_freelance*/))\r
+       if (!_slang_assemble_operation (A, &op->children[2], slang_ref_forbid/*slang_ref_freelance*/))\r
                return GL_FALSE;\r
-       if (!_slang_cleanup_stack_ (A, &op->children[2]))\r
+       if (!_slang_cleanup_stack (A, &op->children[2]))\r
                return GL_FALSE;\r
 \r
        /* resolve the condition point */\r
        A->file->code[start_jump].param[0] = A->file->count;\r
 \r
        /* execute condition statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to the end of the loop if not true */\r
@@ -239,9 +237,9 @@ GLboolean _slang_assemble_for (slang_assemble_ctx *A, slang_operation *op)
        /* execute loop body */\r
        A->flow.loop_start = cont_label;\r
        A->flow.loop_end = break_label;\r
-       if (!_slang_assemble_operation_ (A, &op->children[3], slang_ref_forbid/*slang_ref_freelance*/))\r
+       if (!_slang_assemble_operation (A, &op->children[3], slang_ref_forbid/*slang_ref_freelance*/))\r
                return GL_FALSE;\r
-       if (!_slang_cleanup_stack_ (A, &op->children[3]))\r
+       if (!_slang_cleanup_stack (A, &op->children[3]))\r
                return GL_FALSE;\r
        A->flow = save_flow;\r
 \r
@@ -303,9 +301,9 @@ GLboolean _slang_assemble_do (slang_assemble_ctx *A, slang_operation *op)
        /* execute loop body */\r
        A->flow.loop_start = cont_label;\r
        A->flow.loop_end = break_label;\r
-       if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_forbid/*slang_ref_freelance*/))\r
+       if (!_slang_assemble_operation (A, &op->children[0], slang_ref_forbid/*slang_ref_freelance*/))\r
                return GL_FALSE;\r
-       if (!_slang_cleanup_stack_ (A, &op->children[0]))\r
+       if (!_slang_cleanup_stack (A, &op->children[0]))\r
                return GL_FALSE;\r
        A->flow = save_flow;\r
 \r
@@ -313,7 +311,7 @@ GLboolean _slang_assemble_do (slang_assemble_ctx *A, slang_operation *op)
        A->file->code[cont_jump].param[0] = A->file->count;\r
 \r
        /* execute condition statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to the end of the loop if not true */\r
@@ -368,7 +366,7 @@ GLboolean _slang_assemble_while (slang_assemble_ctx *A, slang_operation *op)
        A->file->code[skip_jump].param[0] = A->file->count;\r
 \r
        /* execute condition statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[0], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to the end of the loop if not true */\r
@@ -379,9 +377,9 @@ GLboolean _slang_assemble_while (slang_assemble_ctx *A, slang_operation *op)
        /* execute loop body */\r
        A->flow.loop_start = A->file->code[skip_jump].param[0];\r
        A->flow.loop_end = break_label;\r
-       if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid/*slang_ref_freelance*/))\r
+       if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid/*slang_ref_freelance*/))\r
                return GL_FALSE;\r
-       if (!_slang_cleanup_stack_ (A, &op->children[1]))\r
+       if (!_slang_cleanup_stack (A, &op->children[1]))\r
                return GL_FALSE;\r
        A->flow = save_flow;\r
 \r
@@ -414,7 +412,7 @@ GLboolean _slang_assemble_if (slang_assemble_ctx *A, slang_operation *op)
        GLuint cond_jump, else_jump;\r
 \r
        /* execute condition statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[0], slang_ref_forbid))\r
+       if (!_slang_assemble_operation (A, &op->children[0], slang_ref_forbid))\r
                return GL_FALSE;\r
 \r
        /* jump to false-statement if not true */\r
@@ -423,9 +421,9 @@ GLboolean _slang_assemble_if (slang_assemble_ctx *A, slang_operation *op)
                return GL_FALSE;\r
 \r
        /* execute true-statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[1], slang_ref_forbid/*slang_ref_freelance*/))\r
+       if (!_slang_assemble_operation (A, &op->children[1], slang_ref_forbid/*slang_ref_freelance*/))\r
                return GL_FALSE;\r
-       if (!_slang_cleanup_stack_ (A, &op->children[1]))\r
+       if (!_slang_cleanup_stack (A, &op->children[1]))\r
                return GL_FALSE;\r
 \r
        /* skip if-false statement */\r
@@ -437,9 +435,9 @@ GLboolean _slang_assemble_if (slang_assemble_ctx *A, slang_operation *op)
        A->file->code[cond_jump].param[0] = A->file->count;\r
 \r
        /* execute false-statement */\r
-       if (!_slang_assemble_operation_ (A, &op->children[2], slang_ref_forbid/*slang_ref_freelance*/))\r
+       if (!_slang_assemble_operation (A, &op->children[2], slang_ref_forbid/*slang_ref_freelance*/))\r
                return GL_FALSE;\r
-       if (!_slang_cleanup_stack_ (A, &op->children[2]))\r
+       if (!_slang_cleanup_stack (A, &op->children[2]))\r
                return GL_FALSE;\r
 \r
        /* resolve end of if-false statement */\r