diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | src/mesa/Makefile | 4 | ||||
| -rw-r--r-- | src/mesa/SConscript | 38 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 4 | ||||
| -rw-r--r-- | src/mesa/slang/descrip.mms (renamed from src/mesa/shader/slang/descrip.mms) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/.gitignore (renamed from src/mesa/shader/slang/library/.gitignore) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/Makefile (renamed from src/mesa/shader/slang/library/Makefile) | 2 | ||||
| -rw-r--r-- | src/mesa/slang/library/SConscript (renamed from src/mesa/shader/slang/library/SConscript) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/slang_120_core.gc (renamed from src/mesa/shader/slang/library/slang_120_core.gc) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/slang_builtin_120_common.gc (renamed from src/mesa/shader/slang/library/slang_builtin_120_common.gc) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/slang_builtin_120_fragment.gc (renamed from src/mesa/shader/slang/library/slang_builtin_120_fragment.gc) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/slang_common_builtin.gc (renamed from src/mesa/shader/slang/library/slang_common_builtin.gc) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/slang_core.gc (renamed from src/mesa/shader/slang/library/slang_core.gc) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/slang_fragment_builtin.gc (renamed from src/mesa/shader/slang/library/slang_fragment_builtin.gc) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/library/slang_vertex_builtin.gc (renamed from src/mesa/shader/slang/library/slang_vertex_builtin.gc) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_builtin.c (renamed from src/mesa/shader/slang/slang_builtin.c) | 4 | ||||
| -rw-r--r-- | src/mesa/slang/slang_builtin.h (renamed from src/mesa/shader/slang/slang_builtin.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_codegen.c (renamed from src/mesa/shader/slang/slang_codegen.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_codegen.h (renamed from src/mesa/shader/slang/slang_codegen.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile.c (renamed from src/mesa/shader/slang/slang_compile.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile.h (renamed from src/mesa/shader/slang/slang_compile.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_function.c (renamed from src/mesa/shader/slang/slang_compile_function.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_function.h (renamed from src/mesa/shader/slang/slang_compile_function.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_operation.c (renamed from src/mesa/shader/slang/slang_compile_operation.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_operation.h (renamed from src/mesa/shader/slang/slang_compile_operation.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_struct.c (renamed from src/mesa/shader/slang/slang_compile_struct.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_struct.h (renamed from src/mesa/shader/slang/slang_compile_struct.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_variable.c (renamed from src/mesa/shader/slang/slang_compile_variable.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_compile_variable.h (renamed from src/mesa/shader/slang/slang_compile_variable.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_emit.c (renamed from src/mesa/shader/slang/slang_emit.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_emit.h (renamed from src/mesa/shader/slang/slang_emit.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_ir.c (renamed from src/mesa/shader/slang/slang_ir.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_ir.h (renamed from src/mesa/shader/slang/slang_ir.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_label.c (renamed from src/mesa/shader/slang/slang_label.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_label.h (renamed from src/mesa/shader/slang/slang_label.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_link.c (renamed from src/mesa/shader/slang/slang_link.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_link.h (renamed from src/mesa/shader/slang/slang_link.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_log.c (renamed from src/mesa/shader/slang/slang_log.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_log.h (renamed from src/mesa/shader/slang/slang_log.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_mem.c (renamed from src/mesa/shader/slang/slang_mem.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_mem.h (renamed from src/mesa/shader/slang/slang_mem.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_print.c (renamed from src/mesa/shader/slang/slang_print.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_print.h (renamed from src/mesa/shader/slang/slang_print.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_simplify.c (renamed from src/mesa/shader/slang/slang_simplify.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_simplify.h (renamed from src/mesa/shader/slang/slang_simplify.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_storage.c (renamed from src/mesa/shader/slang/slang_storage.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_storage.h (renamed from src/mesa/shader/slang/slang_storage.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_typeinfo.c (renamed from src/mesa/shader/slang/slang_typeinfo.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_typeinfo.h (renamed from src/mesa/shader/slang/slang_typeinfo.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_utility.c (renamed from src/mesa/shader/slang/slang_utility.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_utility.h (renamed from src/mesa/shader/slang/slang_utility.h) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_vartable.c (renamed from src/mesa/shader/slang/slang_vartable.c) | 0 | ||||
| -rw-r--r-- | src/mesa/slang/slang_vartable.h (renamed from src/mesa/shader/slang/slang_vartable.h) | 0 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 38 |
54 files changed, 49 insertions, 49 deletions
@@ -246,10 +246,10 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/shader/*.[chly] \ $(DIRECTORY)/src/mesa/shader/Makefile \ $(DIRECTORY)/src/mesa/shader/descrip.mms \ - $(DIRECTORY)/src/mesa/shader/slang/*.[ch] \ - $(DIRECTORY)/src/mesa/shader/slang/descrip.mms \ - $(DIRECTORY)/src/mesa/shader/slang/library/*.gc \ - $(DIRECTORY)/src/mesa/shader/slang/library/Makefile \ + $(DIRECTORY)/src/mesa/slang/*.[ch] \ + $(DIRECTORY)/src/mesa/slang/descrip.mms \ + $(DIRECTORY)/src/mesa/slang/library/*.gc \ + $(DIRECTORY)/src/mesa/slang/library/Makefile \ $(DIRECTORY)/src/mesa/swrast/*.[ch] \ $(DIRECTORY)/src/mesa/swrast/descrip.mms \ $(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \ diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 4f81768924..3e0f010671 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -116,7 +116,7 @@ asm_subdirs: ###################################################################### # GLSL built-in library glsl_builtin: - (cd shader/slang/library && $(MAKE)) || exit 1 ; + (cd slang/library && $(MAKE)) || exit 1 ; ###################################################################### @@ -234,7 +234,7 @@ clean: clean-es1 clean-es2 -rm -f depend depend.bak libmesa.a libmesagallium.a -rm -f drivers/*/*.o -rm -f *.pc - -rm -f shader/slang/library/*_gc.h + -rm -f slang/library/*_gc.h -@cd drivers/dri && $(MAKE) clean -@cd drivers/x11 && $(MAKE) clean -@cd drivers/osmesa && $(MAKE) clean diff --git a/src/mesa/SConscript b/src/mesa/SConscript index b65c86da82..405b5c8830 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -221,25 +221,25 @@ if env['platform'] != 'winddk': ] slang_sources = [ - 'shader/slang/slang_builtin.c', - 'shader/slang/slang_codegen.c', - 'shader/slang/slang_compile.c', - 'shader/slang/slang_compile_function.c', - 'shader/slang/slang_compile_operation.c', - 'shader/slang/slang_compile_struct.c', - 'shader/slang/slang_compile_variable.c', - 'shader/slang/slang_emit.c', - 'shader/slang/slang_ir.c', - 'shader/slang/slang_label.c', - 'shader/slang/slang_link.c', - 'shader/slang/slang_log.c', - 'shader/slang/slang_mem.c', - 'shader/slang/slang_print.c', - 'shader/slang/slang_simplify.c', - 'shader/slang/slang_storage.c', - 'shader/slang/slang_typeinfo.c', - 'shader/slang/slang_vartable.c', - 'shader/slang/slang_utility.c', + 'slang/slang_builtin.c', + 'slang/slang_codegen.c', + 'slang/slang_compile.c', + 'slang/slang_compile_function.c', + 'slang/slang_compile_operation.c', + 'slang/slang_compile_struct.c', + 'slang/slang_compile_variable.c', + 'slang/slang_emit.c', + 'slang/slang_ir.c', + 'slang/slang_label.c', + 'slang/slang_link.c', + 'slang/slang_log.c', + 'slang/slang_mem.c', + 'slang/slang_print.c', + 'slang/slang_simplify.c', + 'slang/slang_storage.c', + 'slang/slang_typeinfo.c', + 'slang/slang_vartable.c', + 'slang/slang_utility.c', ] mesa_sources = ( diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 88edb541ac..81c3964f93 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -45,8 +45,8 @@ #include "shader/program.h" #include "shader/prog_parameter.h" #include "shader/prog_uniform.h" -#include "shader/slang/slang_compile.h" -#include "shader/slang/slang_link.h" +#include "slang/slang_compile.h" +#include "slang/slang_link.h" /** Define this to enable shader substitution (see below) */ diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/slang/descrip.mms index 674b786ac0..674b786ac0 100644 --- a/src/mesa/shader/slang/descrip.mms +++ b/src/mesa/slang/descrip.mms diff --git a/src/mesa/shader/slang/library/.gitignore b/src/mesa/slang/library/.gitignore index 02a89fc7df..02a89fc7df 100644 --- a/src/mesa/shader/slang/library/.gitignore +++ b/src/mesa/slang/library/.gitignore diff --git a/src/mesa/shader/slang/library/Makefile b/src/mesa/slang/library/Makefile index c6964512bf..75c91e7db7 100644 --- a/src/mesa/shader/slang/library/Makefile +++ b/src/mesa/slang/library/Makefile @@ -1,6 +1,6 @@ # src/mesa/shader/slang/library/Makefile -TOP = ../../../../.. +TOP = ../../../.. include $(TOP)/configs/current diff --git a/src/mesa/shader/slang/library/SConscript b/src/mesa/slang/library/SConscript index 0b25467a4e..0b25467a4e 100644 --- a/src/mesa/shader/slang/library/SConscript +++ b/src/mesa/slang/library/SConscript diff --git a/src/mesa/shader/slang/library/slang_120_core.gc b/src/mesa/slang/library/slang_120_core.gc index 04c5ec2ec5..04c5ec2ec5 100644 --- a/src/mesa/shader/slang/library/slang_120_core.gc +++ b/src/mesa/slang/library/slang_120_core.gc diff --git a/src/mesa/shader/slang/library/slang_builtin_120_common.gc b/src/mesa/slang/library/slang_builtin_120_common.gc index c6264c3b47..c6264c3b47 100644 --- a/src/mesa/shader/slang/library/slang_builtin_120_common.gc +++ b/src/mesa/slang/library/slang_builtin_120_common.gc diff --git a/src/mesa/shader/slang/library/slang_builtin_120_fragment.gc b/src/mesa/slang/library/slang_builtin_120_fragment.gc index 7d516046a1..7d516046a1 100644 --- a/src/mesa/shader/slang/library/slang_builtin_120_fragment.gc +++ b/src/mesa/slang/library/slang_builtin_120_fragment.gc diff --git a/src/mesa/shader/slang/library/slang_common_builtin.gc b/src/mesa/slang/library/slang_common_builtin.gc index d75354deff..d75354deff 100644 --- a/src/mesa/shader/slang/library/slang_common_builtin.gc +++ b/src/mesa/slang/library/slang_common_builtin.gc diff --git a/src/mesa/shader/slang/library/slang_core.gc b/src/mesa/slang/library/slang_core.gc index 0a0d15903b..0a0d15903b 100644 --- a/src/mesa/shader/slang/library/slang_core.gc +++ b/src/mesa/slang/library/slang_core.gc diff --git a/src/mesa/shader/slang/library/slang_fragment_builtin.gc b/src/mesa/slang/library/slang_fragment_builtin.gc index 54a80ea0e0..54a80ea0e0 100644 --- a/src/mesa/shader/slang/library/slang_fragment_builtin.gc +++ b/src/mesa/slang/library/slang_fragment_builtin.gc diff --git a/src/mesa/shader/slang/library/slang_vertex_builtin.gc b/src/mesa/slang/library/slang_vertex_builtin.gc index 0c67c2ef20..0c67c2ef20 100644 --- a/src/mesa/shader/slang/library/slang_vertex_builtin.gc +++ b/src/mesa/slang/library/slang_vertex_builtin.gc diff --git a/src/mesa/shader/slang/slang_builtin.c b/src/mesa/slang/slang_builtin.c index b7bf4e06dc..edb6052cb5 100644 --- a/src/mesa/shader/slang/slang_builtin.c +++ b/src/mesa/slang/slang_builtin.c @@ -35,8 +35,8 @@ #include "shader/prog_instruction.h" #include "shader/prog_parameter.h" #include "shader/prog_statevars.h" -#include "shader/slang/slang_ir.h" -#include "shader/slang/slang_builtin.h" +#include "slang/slang_ir.h" +#include "slang/slang_builtin.h" /** special state token (see below) */ diff --git a/src/mesa/shader/slang/slang_builtin.h b/src/mesa/slang/slang_builtin.h index c3021ca33c..c3021ca33c 100644 --- a/src/mesa/shader/slang/slang_builtin.h +++ b/src/mesa/slang/slang_builtin.h diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/slang/slang_codegen.c index 0504d47765..0504d47765 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/slang/slang_codegen.c diff --git a/src/mesa/shader/slang/slang_codegen.h b/src/mesa/slang/slang_codegen.h index 461633fe34..461633fe34 100644 --- a/src/mesa/shader/slang/slang_codegen.h +++ b/src/mesa/slang/slang_codegen.h diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/slang/slang_compile.c index b6b1f3c990..b6b1f3c990 100644 --- a/src/mesa/shader/slang/slang_compile.c +++ b/src/mesa/slang/slang_compile.c diff --git a/src/mesa/shader/slang/slang_compile.h b/src/mesa/slang/slang_compile.h index 7fb549d33d..7fb549d33d 100644 --- a/src/mesa/shader/slang/slang_compile.h +++ b/src/mesa/slang/slang_compile.h diff --git a/src/mesa/shader/slang/slang_compile_function.c b/src/mesa/slang/slang_compile_function.c index 4dd885176d..4dd885176d 100644 --- a/src/mesa/shader/slang/slang_compile_function.c +++ b/src/mesa/slang/slang_compile_function.c diff --git a/src/mesa/shader/slang/slang_compile_function.h b/src/mesa/slang/slang_compile_function.h index a5445ec253..a5445ec253 100644 --- a/src/mesa/shader/slang/slang_compile_function.h +++ b/src/mesa/slang/slang_compile_function.h diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/slang/slang_compile_operation.c index 5441d60df5..5441d60df5 100644 --- a/src/mesa/shader/slang/slang_compile_operation.c +++ b/src/mesa/slang/slang_compile_operation.c diff --git a/src/mesa/shader/slang/slang_compile_operation.h b/src/mesa/slang/slang_compile_operation.h index 1f15c19896..1f15c19896 100644 --- a/src/mesa/shader/slang/slang_compile_operation.h +++ b/src/mesa/slang/slang_compile_operation.h diff --git a/src/mesa/shader/slang/slang_compile_struct.c b/src/mesa/slang/slang_compile_struct.c index e6c38730d7..e6c38730d7 100644 --- a/src/mesa/shader/slang/slang_compile_struct.c +++ b/src/mesa/slang/slang_compile_struct.c diff --git a/src/mesa/shader/slang/slang_compile_struct.h b/src/mesa/slang/slang_compile_struct.h index 90c5512f4d..90c5512f4d 100644 --- a/src/mesa/shader/slang/slang_compile_struct.h +++ b/src/mesa/slang/slang_compile_struct.h diff --git a/src/mesa/shader/slang/slang_compile_variable.c b/src/mesa/slang/slang_compile_variable.c index 23c08a9039..23c08a9039 100644 --- a/src/mesa/shader/slang/slang_compile_variable.c +++ b/src/mesa/slang/slang_compile_variable.c diff --git a/src/mesa/shader/slang/slang_compile_variable.h b/src/mesa/slang/slang_compile_variable.h index 5c9d248b35..5c9d248b35 100644 --- a/src/mesa/shader/slang/slang_compile_variable.h +++ b/src/mesa/slang/slang_compile_variable.h diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/slang/slang_emit.c index 4d4c611dfe..4d4c611dfe 100644 --- a/src/mesa/shader/slang/slang_emit.c +++ b/src/mesa/slang/slang_emit.c diff --git a/src/mesa/shader/slang/slang_emit.h b/src/mesa/slang/slang_emit.h index ab4c202d67..ab4c202d67 100644 --- a/src/mesa/shader/slang/slang_emit.h +++ b/src/mesa/slang/slang_emit.h diff --git a/src/mesa/shader/slang/slang_ir.c b/src/mesa/slang/slang_ir.c index c223004b22..c223004b22 100644 --- a/src/mesa/shader/slang/slang_ir.c +++ b/src/mesa/slang/slang_ir.c diff --git a/src/mesa/shader/slang/slang_ir.h b/src/mesa/slang/slang_ir.h index 166b4e8043..166b4e8043 100644 --- a/src/mesa/shader/slang/slang_ir.h +++ b/src/mesa/slang/slang_ir.h diff --git a/src/mesa/shader/slang/slang_label.c b/src/mesa/slang/slang_label.c index 8e3a8ebc1a..8e3a8ebc1a 100644 --- a/src/mesa/shader/slang/slang_label.c +++ b/src/mesa/slang/slang_label.c diff --git a/src/mesa/shader/slang/slang_label.h b/src/mesa/slang/slang_label.h index 87068ae7a7..87068ae7a7 100644 --- a/src/mesa/shader/slang/slang_label.h +++ b/src/mesa/slang/slang_label.h diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/slang/slang_link.c index 56d42ca0a7..56d42ca0a7 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/slang/slang_link.c diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/slang/slang_link.h index 2b44d20787..2b44d20787 100644 --- a/src/mesa/shader/slang/slang_link.h +++ b/src/mesa/slang/slang_link.h diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/slang/slang_log.c index 9ff21417bc..9ff21417bc 100644 --- a/src/mesa/shader/slang/slang_log.c +++ b/src/mesa/slang/slang_log.c diff --git a/src/mesa/shader/slang/slang_log.h b/src/mesa/slang/slang_log.h index dcaba0285a..dcaba0285a 100644 --- a/src/mesa/shader/slang/slang_log.h +++ b/src/mesa/slang/slang_log.h diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/slang/slang_mem.c index 5eaa7c4427..5eaa7c4427 100644 --- a/src/mesa/shader/slang/slang_mem.c +++ b/src/mesa/slang/slang_mem.c diff --git a/src/mesa/shader/slang/slang_mem.h b/src/mesa/slang/slang_mem.h index b5bfae2479..b5bfae2479 100644 --- a/src/mesa/shader/slang/slang_mem.h +++ b/src/mesa/slang/slang_mem.h diff --git a/src/mesa/shader/slang/slang_print.c b/src/mesa/slang/slang_print.c index 6b34f395fd..6b34f395fd 100644 --- a/src/mesa/shader/slang/slang_print.c +++ b/src/mesa/slang/slang_print.c diff --git a/src/mesa/shader/slang/slang_print.h b/src/mesa/slang/slang_print.h index 46605c8061..46605c8061 100644 --- a/src/mesa/shader/slang/slang_print.h +++ b/src/mesa/slang/slang_print.h diff --git a/src/mesa/shader/slang/slang_simplify.c b/src/mesa/slang/slang_simplify.c index 13b9ca3c87..13b9ca3c87 100644 --- a/src/mesa/shader/slang/slang_simplify.c +++ b/src/mesa/slang/slang_simplify.c diff --git a/src/mesa/shader/slang/slang_simplify.h b/src/mesa/slang/slang_simplify.h index 8689c23b1a..8689c23b1a 100644 --- a/src/mesa/shader/slang/slang_simplify.h +++ b/src/mesa/slang/slang_simplify.h diff --git a/src/mesa/shader/slang/slang_storage.c b/src/mesa/slang/slang_storage.c index 656e15670d..656e15670d 100644 --- a/src/mesa/shader/slang/slang_storage.c +++ b/src/mesa/slang/slang_storage.c diff --git a/src/mesa/shader/slang/slang_storage.h b/src/mesa/slang/slang_storage.h index 1876a36dd6..1876a36dd6 100644 --- a/src/mesa/shader/slang/slang_storage.h +++ b/src/mesa/slang/slang_storage.h diff --git a/src/mesa/shader/slang/slang_typeinfo.c b/src/mesa/slang/slang_typeinfo.c index 0f96768b02..0f96768b02 100644 --- a/src/mesa/shader/slang/slang_typeinfo.c +++ b/src/mesa/slang/slang_typeinfo.c diff --git a/src/mesa/shader/slang/slang_typeinfo.h b/src/mesa/slang/slang_typeinfo.h index 9a6407a31b..9a6407a31b 100644 --- a/src/mesa/shader/slang/slang_typeinfo.h +++ b/src/mesa/slang/slang_typeinfo.h diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/slang/slang_utility.c index c1d57409a4..c1d57409a4 100644 --- a/src/mesa/shader/slang/slang_utility.c +++ b/src/mesa/slang/slang_utility.c diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/slang/slang_utility.h index 2c0d0bcbb2..2c0d0bcbb2 100644 --- a/src/mesa/shader/slang/slang_utility.h +++ b/src/mesa/slang/slang_utility.h diff --git a/src/mesa/shader/slang/slang_vartable.c b/src/mesa/slang/slang_vartable.c index e07e3a226a..e07e3a226a 100644 --- a/src/mesa/shader/slang/slang_vartable.c +++ b/src/mesa/slang/slang_vartable.c diff --git a/src/mesa/shader/slang/slang_vartable.h b/src/mesa/slang/slang_vartable.h index 94bcd63f45..94bcd63f45 100644 --- a/src/mesa/shader/slang/slang_vartable.h +++ b/src/mesa/slang/slang_vartable.h diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 38b781cb4c..236baf5e2f 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -251,25 +251,25 @@ SHADER_SOURCES = \ shader/symbol_table.c SLANG_SOURCES = \ - shader/slang/slang_builtin.c \ - shader/slang/slang_codegen.c \ - shader/slang/slang_compile.c \ - shader/slang/slang_compile_function.c \ - shader/slang/slang_compile_operation.c \ - shader/slang/slang_compile_struct.c \ - shader/slang/slang_compile_variable.c \ - shader/slang/slang_emit.c \ - shader/slang/slang_ir.c \ - shader/slang/slang_label.c \ - shader/slang/slang_link.c \ - shader/slang/slang_log.c \ - shader/slang/slang_mem.c \ - shader/slang/slang_print.c \ - shader/slang/slang_simplify.c \ - shader/slang/slang_storage.c \ - shader/slang/slang_typeinfo.c \ - shader/slang/slang_vartable.c \ - shader/slang/slang_utility.c + slang/slang_builtin.c \ + slang/slang_codegen.c \ + slang/slang_compile.c \ + slang/slang_compile_function.c \ + slang/slang_compile_operation.c \ + slang/slang_compile_struct.c \ + slang/slang_compile_variable.c \ + slang/slang_emit.c \ + slang/slang_ir.c \ + slang/slang_label.c \ + slang/slang_link.c \ + slang/slang_log.c \ + slang/slang_mem.c \ + slang/slang_print.c \ + slang/slang_simplify.c \ + slang/slang_storage.c \ + slang/slang_typeinfo.c \ + slang/slang_vartable.c \ + slang/slang_utility.c ASM_C_SOURCES = \ x86/common_x86.c \ |