diff options
Diffstat (limited to 'src/mesa/shader/slang/slang_compile.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_compile.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c index ed82712b20..2377173cf0 100644 --- a/src/mesa/shader/slang/slang_compile.c +++ b/src/mesa/shader/slang/slang_compile.c @@ -2103,7 +2103,7 @@ if (x == 1) space.structs = structs; space.vars = scope; if (x == 1) -xxx_first (&file);
+xxx_first (&file); (**parsed_func_ret).address = file.count; if (!_slang_assemble_function (&file, *parsed_func_ret, &space)) { @@ -2111,7 +2111,7 @@ xxx_first (&file); return 0; } if (slang_string_compare ("main", (**parsed_func_ret).header.name) == 0) -{
+{ xxx_prolog (&file, (**parsed_func_ret).address); _slang_execute (&file); slang_assembly_file_destruct (&file); @@ -2254,9 +2254,9 @@ static const char *slang_shader_syn = static const byte slang_core_gc_bin[] = { #include "library/slang_core_gc_bin.h" };*/ -static const byte slang_core_gc[] = {
-#include "library/slang_core_gc.h"
-};
+static const byte slang_core_gc[] = { +#include "library/slang_core_gc.h" +}; static const byte slang_common_builtin_gc_bin[] = { #include "library/slang_common_builtin_gc_bin.h" @@ -2269,7 +2269,7 @@ static const byte slang_fragment_builtin_gc_bin[] = { static const byte slang_vertex_builtin_gc_bin[] = { #include "library/slang_vertex_builtin_gc_bin.h" }; -
+ int _slang_compile (const char *source, slang_translation_unit *unit, slang_unit_type type, slang_info_log *log) { @@ -2301,8 +2301,8 @@ int _slang_compile (const char *source, slang_translation_unit *unit, slang_unit if (type == slang_unit_fragment_shader || type == slang_unit_vertex_shader) { /*if (!compile_binary (slang_core_gc_bin, builtin_units, - slang_unit_fragment_builtin, log, NULL))*/
- if (!compile_with_grammar (id, slang_core_gc, builtin_units, slang_unit_fragment_builtin,
+ slang_unit_fragment_builtin, log, NULL))*/ + if (!compile_with_grammar (id, (const char*) slang_core_gc, builtin_units, slang_unit_fragment_builtin, log, NULL)) { grammar_destroy (id); @@ -2318,7 +2318,7 @@ int _slang_compile (const char *source, slang_translation_unit *unit, slang_unit if (type == slang_unit_fragment_shader) { if (!compile_binary (slang_fragment_builtin_gc_bin, builtin_units + 2, - slang_unit_fragment_builtin, log, NULL))
+ slang_unit_fragment_builtin, log, NULL)) { slang_translation_unit_destruct (builtin_units); slang_translation_unit_destruct (builtin_units + 1); @@ -2329,7 +2329,7 @@ int _slang_compile (const char *source, slang_translation_unit *unit, slang_unit else if (type == slang_unit_vertex_shader) { if (!compile_binary (slang_vertex_builtin_gc_bin, builtin_units + 2, - slang_unit_vertex_builtin, log, NULL))
+ slang_unit_vertex_builtin, log, NULL)) { slang_translation_unit_destruct (builtin_units); slang_translation_unit_destruct (builtin_units + 1); |