updated some printfs, added comment about sched_yield

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

diff --git a/src/mesa/shader/slang/slang_assemble.c b/src/mesa/shader/slang/slang_assemble.c
index 6c05e71b8bd39848fb9b9c49a22db4dbecf68146..faa13b33e69336bd0ac60b37686fce2cc6c27a59 100644 (file)
--- a/src/mesa/shader/slang/slang_assemble.c
+++ b/src/mesa/shader/slang/slang_assemble.c
@@ -29,13 +29,9 @@
  */\r
 \r
 #include "imports.h"\r
-#include "slang_utility.h"\r
 #include "slang_assemble.h"\r
+#include "slang_compile.h"\r
 #include "slang_storage.h"\r
-#include "slang_assemble_typeinfo.h"\r
-#include "slang_assemble_conditional.h"\r
-#include "slang_assemble_assignment.h"\r
-#include "slang_execute.h"\r
 \r
 /* slang_assembly */\r
 \r
@@ -376,14 +372,16 @@ GLboolean _slang_cleanup_stack (slang_assemble_ctx *A, slang_operation *op)
                slang_assembly_typeinfo_destruct (&ti);\r
                return GL_FALSE;\r
        }\r
-       if (ti.spec.type != slang_spec_void)\r
-               if (A->ref == slang_ref_force)\r
+       if (ti.spec.type != slang_spec_void) {\r
+               if (A->ref == slang_ref_force) {\r
                        size = 4;\r
+               }\r
                else if (!sizeof_variable (A, &ti.spec, slang_qual_none, 0, &size))\r
                {\r
                        slang_assembly_typeinfo_destruct (&ti);\r
                        return GL_FALSE;\r
                }\r
+       }\r
        slang_assembly_typeinfo_destruct (&ti);\r
 \r
        /* if nonzero, free it from the stack */\r
@@ -646,7 +644,12 @@ static const struct
        { "float_noise3",   slang_asm_float_noise3,   slang_asm_float_copy },\r
        { "float_noise4",   slang_asm_float_noise4,   slang_asm_float_copy },\r
        { "int_to_float",   slang_asm_int_to_float,   slang_asm_float_copy },\r
+       { "vec4_tex1d",     slang_asm_vec4_tex1d,     slang_asm_none },\r
        { "vec4_tex2d",     slang_asm_vec4_tex2d,     slang_asm_none },\r
+       { "vec4_tex3d",     slang_asm_vec4_tex3d,     slang_asm_none },\r
+       { "vec4_texcube",   slang_asm_vec4_texcube,   slang_asm_none },\r
+       { "vec4_shad1d",    slang_asm_vec4_shad1d,    slang_asm_none },\r
+       { "vec4_shad2d",    slang_asm_vec4_shad2d,    slang_asm_none },\r
        /* mesa-specific extensions */\r
        { "float_print",    slang_asm_float_deref,    slang_asm_float_print },\r
        { "int_print",      slang_asm_int_deref,      slang_asm_int_print },\r
@@ -932,7 +935,9 @@ static GLboolean handle_field (slang_assemble_ctx *A, slang_assembly_typeinfo *t
        else\r
        {\r
                GLuint i, struct_size = 0, field_offset = 0, field_size = 0;\r
+               GLboolean relocate, shrink;\r
 \r
+               /* calculate struct size, field offset and field size */\r
                for (i = 0; i < tib->spec._struct->fields->num_variables; i++)\r
                {\r
                        slang_variable *field;\r
@@ -962,28 +967,56 @@ static GLboolean handle_field (slang_assemble_ctx *A, slang_assembly_typeinfo *t
                                field_offset += size;\r
                }\r
 \r
-               if (!PLAB (A->file, slang_asm_addr_push, field_offset))\r
-                       return GL_FALSE;\r
+               /*\r
+                * OPTIMIZATION: If selecting the last field, no relocation is needed.\r
+                */\r
+               relocate = field_offset != struct_size - field_size;\r
 \r
-               if (ref == slang_ref_force)\r
+               /*\r
+                * OPTIMIZATION: If field and struct sizes are equal, no partial free is needed.\r
+                */\r
+               shrink = field_size != struct_size;\r
+\r
+               if (relocate)\r
                {\r
-                       if (!PUSH (A->file, slang_asm_addr_add))\r
+                       if (!PLAB (A->file, slang_asm_addr_push, field_offset))\r
                                return GL_FALSE;\r
                }\r
+\r
+               if (ref == slang_ref_force)\r
+               {\r
+                       if (relocate)\r
+                       {\r
+                               if (!PUSH (A->file, slang_asm_addr_add))\r
+                                       return GL_FALSE;\r
+                       }\r
+               }\r
                else\r
                {\r
-                       GLuint i;\r
+                       GLuint free_b = 0;\r
 \r
-                       /* move the selected element to the beginning of the master expression */\r
-                       for (i = 0; i < field_size; i += 4)\r
-                               if (!PLAB2 (A->file, slang_asm_float_move, struct_size - field_size + i + 4, i + 4))\r
-                                       return GL_FALSE;\r
-                       if (!PLAB (A->file, slang_asm_local_free, 4))\r
-                               return GL_FALSE;\r
+                       if (relocate)\r
+                       {\r
+                               GLuint i;\r
 \r
-                       /* free the rest of the master expression */\r
-                       if (!PLAB (A->file, slang_asm_local_free, struct_size - field_size))\r
-                               return GL_FALSE;\r
+                               /* move the selected element to the beginning of the master expression */\r
+                               for (i = 0; i < field_size; i += 4)\r
+                                       if (!PLAB2 (A->file, slang_asm_float_move, struct_size - field_size + i + 4, i + 4))\r
+                                               return GL_FALSE;\r
+                               free_b += 4;\r
+                       }\r
+\r
+                       if (shrink)\r
+                       {\r
+                               /* free the rest of the master expression */\r
+                               free_b += struct_size - field_size;\r
+                       }\r
+\r
+                       if (free_b)\r
+                       {\r
+                               if (!PLAB (A->file, slang_asm_local_free, free_b))\r
+                                       return GL_FALSE;\r
+                       }\r
                }\r
        }\r
 \r
@@ -1136,7 +1169,7 @@ GLboolean _slang_assemble_operation (slang_assemble_ctx *A, slang_operation *op,
                        /* push the variable's address */\r
                        if (var->global)\r
                        {\r
-                               if (!PLAB (A->file, slang_asm_addr_push, var->address))\r
+                               if (!PLAB (A->file, slang_asm_global_addr, var->address))\r
                                        return GL_FALSE;\r
                        }\r
                        else\r
@@ -1175,14 +1208,17 @@ GLboolean _slang_assemble_operation (slang_assemble_ctx *A, slang_operation *op,
        case slang_oper_addassign:\r
                if (!_slang_assemble_assign (A, op, "+=", ref))\r
                        return GL_FALSE;\r
+               A->ref = ref;\r
                break;\r
        case slang_oper_subassign:\r
                if (!_slang_assemble_assign (A, op, "-=", ref))\r
                        return GL_FALSE;\r
+               A->ref = ref;\r
                break;\r
        case slang_oper_mulassign:\r
                if (!_slang_assemble_assign (A, op, "*=", ref))\r
                        return GL_FALSE;\r
+               A->ref = ref;\r
                break;\r
        /*case slang_oper_modassign:*/\r
        /*case slang_oper_lshassign:*/\r
@@ -1193,6 +1229,7 @@ GLboolean _slang_assemble_operation (slang_assemble_ctx *A, slang_operation *op,
        case slang_oper_divassign:\r
                if (!_slang_assemble_assign (A, op, "/=", ref))\r
                        return GL_FALSE;\r
+               A->ref = ref;\r
                break;\r
        case slang_oper_select:\r
                if (!_slang_assemble_select (A, op))\r
@@ -1281,10 +1318,12 @@ GLboolean _slang_assemble_operation (slang_assemble_ctx *A, slang_operation *op,
        case slang_oper_preincrement:\r
                if (!_slang_assemble_assign (A, op, "++", ref))\r
                        return GL_FALSE;\r
+               A->ref = ref;\r
                break;\r
        case slang_oper_predecrement:\r
                if (!_slang_assemble_assign (A, op, "--", ref))\r
                        return GL_FALSE;\r
+               A->ref = ref;\r
                break;\r
        case slang_oper_plus:\r
                if (!_slang_dereference (A, op))\r