summaryrefslogtreecommitdiffstats
path: root/src/mesa/slang
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/slang')
-rw-r--r--src/mesa/slang/library/Makefile2
-rw-r--r--src/mesa/slang/library/SConscript28
-rw-r--r--src/mesa/slang/slang_builtin.c8
-rw-r--r--src/mesa/slang/slang_builtin.h2
-rw-r--r--src/mesa/slang/slang_codegen.c10
-rw-r--r--src/mesa/slang/slang_compile.c10
-rw-r--r--src/mesa/slang/slang_emit.c8
-rw-r--r--src/mesa/slang/slang_ir.c4
-rw-r--r--src/mesa/slang/slang_label.h2
-rw-r--r--src/mesa/slang/slang_link.c12
-rw-r--r--src/mesa/slang/slang_typeinfo.c2
-rw-r--r--src/mesa/slang/slang_vartable.c4
12 files changed, 46 insertions, 46 deletions
diff --git a/src/mesa/slang/library/Makefile b/src/mesa/slang/library/Makefile
index 75c91e7db73..5a767742081 100644
--- a/src/mesa/slang/library/Makefile
+++ b/src/mesa/slang/library/Makefile
@@ -1,4 +1,4 @@
-# src/mesa/shader/slang/library/Makefile
+# src/mesa/slang/library/Makefile
TOP = ../../../..
diff --git a/src/mesa/slang/library/SConscript b/src/mesa/slang/library/SConscript
index 0b25467a4e8..792a7953d34 100644
--- a/src/mesa/slang/library/SConscript
+++ b/src/mesa/slang/library/SConscript
@@ -28,25 +28,25 @@ env['BUILDERS']['bld_vert'] = bld_vert
# Generate GLSL builtin library binaries
env.bld_frag(
- '#src/mesa/shader/slang/library/slang_core_gc.h',
- '#src/mesa/shader/slang/library/slang_core.gc')
+ '#src/mesa/slang/library/slang_core_gc.h',
+ '#src/mesa/slang/library/slang_core.gc')
env.bld_frag(
- '#src/mesa/shader/slang/library/slang_common_builtin_gc.h',
- '#src/mesa/shader/slang/library/slang_common_builtin.gc')
+ '#src/mesa/slang/library/slang_common_builtin_gc.h',
+ '#src/mesa/slang/library/slang_common_builtin.gc')
env.bld_frag(
- '#src/mesa/shader/slang/library/slang_fragment_builtin_gc.h',
- '#src/mesa/shader/slang/library/slang_fragment_builtin.gc')
+ '#src/mesa/slang/library/slang_fragment_builtin_gc.h',
+ '#src/mesa/slang/library/slang_fragment_builtin.gc')
env.bld_vert(
- '#src/mesa/shader/slang/library/slang_vertex_builtin_gc.h',
- '#src/mesa/shader/slang/library/slang_vertex_builtin.gc')
+ '#src/mesa/slang/library/slang_vertex_builtin_gc.h',
+ '#src/mesa/slang/library/slang_vertex_builtin.gc')
# Generate GLSL 1.20 builtin library binaries
env.bld_frag(
- '#src/mesa/shader/slang/library/slang_120_core_gc.h',
- '#src/mesa/shader/slang/library/slang_120_core.gc')
+ '#src/mesa/slang/library/slang_120_core_gc.h',
+ '#src/mesa/slang/library/slang_120_core.gc')
env.bld_frag(
- '#src/mesa/shader/slang/library/slang_builtin_120_common_gc.h',
- '#src/mesa/shader/slang/library/slang_builtin_120_common.gc')
+ '#src/mesa/slang/library/slang_builtin_120_common_gc.h',
+ '#src/mesa/slang/library/slang_builtin_120_common.gc')
env.bld_frag(
- '#src/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h',
- '#src/mesa/shader/slang/library/slang_builtin_120_fragment.gc')
+ '#src/mesa/slang/library/slang_builtin_120_fragment_gc.h',
+ '#src/mesa/slang/library/slang_builtin_120_fragment.gc')
diff --git a/src/mesa/slang/slang_builtin.c b/src/mesa/slang/slang_builtin.c
index edb6052cb57..610e793c1d9 100644
--- a/src/mesa/slang/slang_builtin.c
+++ b/src/mesa/slang/slang_builtin.c
@@ -31,10 +31,10 @@
#include "main/imports.h"
#include "main/mtypes.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/program.h"
+#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
+#include "program/prog_statevars.h"
#include "slang/slang_ir.h"
#include "slang/slang_builtin.h"
diff --git a/src/mesa/slang/slang_builtin.h b/src/mesa/slang/slang_builtin.h
index c3021ca33c7..b04b584041b 100644
--- a/src/mesa/slang/slang_builtin.h
+++ b/src/mesa/slang/slang_builtin.h
@@ -26,7 +26,7 @@
#ifndef SLANG_BUILTIN_H
#define SLANG_BUILTIN_H
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
#include "slang_utility.h"
#include "slang_ir.h"
diff --git a/src/mesa/slang/slang_codegen.c b/src/mesa/slang/slang_codegen.c
index 0504d47765f..18a0932e4fc 100644
--- a/src/mesa/slang/slang_codegen.c
+++ b/src/mesa/slang/slang_codegen.c
@@ -40,11 +40,11 @@
#include "main/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-#include "shader/prog_statevars.h"
+#include "program/program.h"
+#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
+#include "program/prog_print.h"
+#include "program/prog_statevars.h"
#include "slang_typeinfo.h"
#include "slang_builtin.h"
#include "slang_codegen.h"
diff --git a/src/mesa/slang/slang_compile.c b/src/mesa/slang/slang_compile.c
index b6b1f3c9906..af672599ed9 100644
--- a/src/mesa/slang/slang_compile.c
+++ b/src/mesa/slang/slang_compile.c
@@ -30,11 +30,11 @@
#include "main/imports.h"
#include "main/context.h"
-#include "shader/program.h"
-#include "shader/programopt.h"
-#include "shader/prog_optimize.h"
-#include "shader/prog_print.h"
-#include "shader/prog_parameter.h"
+#include "program/program.h"
+#include "program/programopt.h"
+#include "program/prog_optimize.h"
+#include "program/prog_print.h"
+#include "program/prog_parameter.h"
#include "../../glsl/pp/sl_pp_public.h"
#include "../../glsl/cl/sl_cl_parse.h"
#include "slang_codegen.h"
diff --git a/src/mesa/slang/slang_emit.c b/src/mesa/slang/slang_emit.c
index 4d4c611dfe4..9997d5b0a07 100644
--- a/src/mesa/slang/slang_emit.c
+++ b/src/mesa/slang/slang_emit.c
@@ -38,10 +38,10 @@
#include "main/imports.h"
#include "main/context.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/program.h"
+#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
+#include "program/prog_print.h"
#include "slang_builtin.h"
#include "slang_emit.h"
#include "slang_mem.h"
diff --git a/src/mesa/slang/slang_ir.c b/src/mesa/slang/slang_ir.c
index c223004b22b..e9aef9878ef 100644
--- a/src/mesa/slang/slang_ir.c
+++ b/src/mesa/slang/slang_ir.c
@@ -27,8 +27,8 @@
#include "main/context.h"
#include "slang_ir.h"
#include "slang_mem.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_print.h"
+#include "program/prog_instruction.h"
+#include "program/prog_print.h"
static const slang_ir_info IrInfo[] = {
diff --git a/src/mesa/slang/slang_label.h b/src/mesa/slang/slang_label.h
index 87068ae7a7f..4d04df18d25 100644
--- a/src/mesa/slang/slang_label.h
+++ b/src/mesa/slang/slang_label.h
@@ -3,7 +3,7 @@
#include "main/imports.h"
#include "main/mtypes.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
struct slang_label_
diff --git a/src/mesa/slang/slang_link.c b/src/mesa/slang/slang_link.c
index 56d42ca0a79..2f47cba1ce3 100644
--- a/src/mesa/slang/slang_link.c
+++ b/src/mesa/slang/slang_link.c
@@ -35,12 +35,12 @@
#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-#include "shader/prog_statevars.h"
-#include "shader/prog_uniform.h"
+#include "program/program.h"
+#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
+#include "program/prog_print.h"
+#include "program/prog_statevars.h"
+#include "program/prog_uniform.h"
#include "slang_builtin.h"
#include "slang_link.h"
diff --git a/src/mesa/slang/slang_typeinfo.c b/src/mesa/slang/slang_typeinfo.c
index 0f96768b02e..d039a12e986 100644
--- a/src/mesa/slang/slang_typeinfo.c
+++ b/src/mesa/slang/slang_typeinfo.c
@@ -29,7 +29,7 @@
*/
#include "main/imports.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
#include "slang_typeinfo.h"
#include "slang_compile.h"
#include "slang_log.h"
diff --git a/src/mesa/slang/slang_vartable.c b/src/mesa/slang/slang_vartable.c
index e07e3a226a5..83716315788 100644
--- a/src/mesa/slang/slang_vartable.c
+++ b/src/mesa/slang/slang_vartable.c
@@ -1,7 +1,7 @@
#include "main/imports.h"
-#include "shader/program.h"
-#include "shader/prog_print.h"
+#include "program/program.h"
+#include "program/prog_print.h"
#include "slang_compile.h"
#include "slang_compile_variable.h"
#include "slang_emit.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 21:37:09 +0000