diff options
author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-14 10:28:45 -0700 |
---|---|---|
committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-14 10:28:47 -0700 |
commit | c34be07230ef98d5021f0bdc88c3b0bc804ee2dd (patch) | |
tree | 19e1e31d40852890f1bfc10f64834e7544fe08e0 | |
parent | bfa3a38280d27fe373cb78d666e926265ef80854 (diff) | |
download | external_mesa3d-c34be07230ef98d5021f0bdc88c3b0bc804ee2dd.zip external_mesa3d-c34be07230ef98d5021f0bdc88c3b0bc804ee2dd.tar.gz external_mesa3d-c34be07230ef98d5021f0bdc88c3b0bc804ee2dd.tar.bz2 |
spirv: Move to compiler/
While it does rely on NIR, it's not really part of the NIR core. At the
moment, it still builds as part of libnir but that can be changed later if
desired.
-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 adc7a42..1973533 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 d1c9b5c..d1c9b5c 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 500f2cb..500f2cb 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 63bcb2f..63bcb2f 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 99514b4..99514b4 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 8b9a63c..8b9a63c 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 6a43ef8..6a43ef8 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 e05d28f..e05d28f 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 3840d8c..3840d8c 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 3cbac1e..3cbac1e 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 52748a0..90732db 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" |