diff options
| -rw-r--r-- | src/compiler/Makefile.sources | 14 | ||||
| -rw-r--r-- | src/compiler/spirv/GLSL.std.450.h (renamed from src/compiler/nir/spirv/GLSL.std.450.h) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/nir_spirv.h (renamed from src/compiler/nir/spirv/nir_spirv.h) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/spirv.h (renamed from src/compiler/nir/spirv/spirv.h) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c (renamed from src/compiler/nir/spirv/spirv_to_nir.c) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_alu.c (renamed from src/compiler/nir/spirv/vtn_alu.c) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_cfg.c (renamed from src/compiler/nir/spirv/vtn_cfg.c) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_glsl450.c (renamed from src/compiler/nir/spirv/vtn_glsl450.c) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_private.h (renamed from src/compiler/nir/spirv/vtn_private.h) | 0 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c (renamed from src/compiler/nir/spirv/vtn_variables.c) | 0 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 2 |
11 files changed, 8 insertions, 8 deletions
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index adc7a428469..19735339bca 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -235,10 +235,10 @@ NIR_FILES = \ nir/nir_worklist.h SPIRV_FILES = \ - nir/spirv/nir_spirv.h \ - nir/spirv/spirv_to_nir.c \ - nir/spirv/vtn_alu.c \ - nir/spirv/vtn_cfg.c \ - nir/spirv/vtn_glsl450.c \ - nir/spirv/vtn_private.h \ - nir/spirv/vtn_variables.c + spirv/nir_spirv.h \ + spirv/spirv_to_nir.c \ + spirv/vtn_alu.c \ + spirv/vtn_cfg.c \ + spirv/vtn_glsl450.c \ + spirv/vtn_private.h \ + spirv/vtn_variables.c diff --git a/src/compiler/nir/spirv/GLSL.std.450.h b/src/compiler/spirv/GLSL.std.450.h index d1c9b5c1d44..d1c9b5c1d44 100644 --- a/src/compiler/nir/spirv/GLSL.std.450.h +++ b/src/compiler/spirv/GLSL.std.450.h diff --git a/src/compiler/nir/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h index 500f2cb94df..500f2cb94df 100644 --- a/src/compiler/nir/spirv/nir_spirv.h +++ b/src/compiler/spirv/nir_spirv.h diff --git a/src/compiler/nir/spirv/spirv.h b/src/compiler/spirv/spirv.h index 63bcb2f88dd..63bcb2f88dd 100644 --- a/src/compiler/nir/spirv/spirv.h +++ b/src/compiler/spirv/spirv.h diff --git a/src/compiler/nir/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 99514b49650..99514b49650 100644 --- a/src/compiler/nir/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c diff --git a/src/compiler/nir/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c index 8b9a63ce760..8b9a63ce760 100644 --- a/src/compiler/nir/spirv/vtn_alu.c +++ b/src/compiler/spirv/vtn_alu.c diff --git a/src/compiler/nir/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c index 6a43ef8b2dd..6a43ef8b2dd 100644 --- a/src/compiler/nir/spirv/vtn_cfg.c +++ b/src/compiler/spirv/vtn_cfg.c diff --git a/src/compiler/nir/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c index e05d28ffede..e05d28ffede 100644 --- a/src/compiler/nir/spirv/vtn_glsl450.c +++ b/src/compiler/spirv/vtn_glsl450.c diff --git a/src/compiler/nir/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h index 3840d8c4b65..3840d8c4b65 100644 --- a/src/compiler/nir/spirv/vtn_private.h +++ b/src/compiler/spirv/vtn_private.h diff --git a/src/compiler/nir/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 3cbac1e5da8..3cbac1e5da8 100644 --- a/src/compiler/nir/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 52748a0619a..90732dba961 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -31,7 +31,7 @@ #include "anv_private.h" #include "brw_nir.h" #include "anv_nir.h" -#include "nir/spirv/nir_spirv.h" +#include "spirv/nir_spirv.h" /* Needed for SWIZZLE macros */ #include "program/prog_instruction.h" |