diff options
| author | Emil Velikov <[email protected]> | 2015-11-25 16:03:26 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-01-26 16:08:27 +0000 |
| commit | f694da80c75cb2a51d0af3b24d68aae9c53d61aa (patch) | |
| tree | c7a4fb40447b9118dc2f802840ffe8e425b4824b /src | |
| parent | 24f984f64ae58c274f79eaf9148aea37df67131c (diff) | |
compiler: move the glsl_types C wrapper alongside their C++ brethren
At a later stage we might want to split out the NIR specific [XXX:
which one was it], as to make things move obvious and rename the files
appropriately. This patch aims to split it out of nir.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
Acked-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/compiler/nir_types.cpp (renamed from src/glsl/nir/nir_types.cpp) | 2 | ||||
| -rw-r--r-- | src/compiler/nir_types.h (renamed from src/glsl/nir/nir_types.h) | 3 | ||||
| -rw-r--r-- | src/glsl/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/glsl/nir/nir.h | 2 | ||||
| -rw-r--r-- | src/glsl/nir/nir_lower_var_copies.c | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index 38e75cfd8c6..e1228cafa21 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -2,5 +2,7 @@ LIBCOMPILER_FILES = \ builtin_type_macros.h \ glsl_types.cpp \ glsl_types.h \ + nir_types.cpp \ + nir_types.h \ shader_enums.c \ shader_enums.h diff --git a/src/glsl/nir/nir_types.cpp b/src/compiler/nir_types.cpp index 41ac54673d9..ddc43becf9a 100644 --- a/src/glsl/nir/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -26,7 +26,7 @@ */ #include "nir_types.h" -#include "ir.h" +#include "glsl/ir.h" void glsl_print_type(const glsl_type *type, FILE *fp) diff --git a/src/glsl/nir/nir_types.h b/src/compiler/nir_types.h index 197978804cc..32fc7661159 100644 --- a/src/glsl/nir/nir_types.h +++ b/src/compiler/nir_types.h @@ -28,10 +28,11 @@ #pragma once #include <stdio.h> +#include <stdbool.h> /* C wrapper around compiler/glsl_types.h */ -#include "compiler/glsl_types.h" +#include "glsl_types.h" #ifdef __cplusplus extern "C" { diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index a3df4c4263d..08b40c5cc8f 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -74,12 +74,10 @@ NIR_FILES = \ nir/nir_split_var_copies.c \ nir/nir_sweep.c \ nir/nir_to_ssa.c \ - nir/nir_types.h \ nir/nir_validate.c \ nir/nir_vla.h \ nir/nir_worklist.c \ - nir/nir_worklist.h \ - nir/nir_types.cpp + nir/nir_worklist.h # libglsl diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index 79b35f7a416..d76df66bb67 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -34,7 +34,7 @@ #include "util/ralloc.h" #include "util/set.h" #include "util/bitset.h" -#include "nir_types.h" +#include "compiler/nir_types.h" #include "compiler/shader_enums.h" #include <stdio.h> diff --git a/src/glsl/nir/nir_lower_var_copies.c b/src/glsl/nir/nir_lower_var_copies.c index 350e99c3423..8cb3edd0a84 100644 --- a/src/glsl/nir/nir_lower_var_copies.c +++ b/src/glsl/nir/nir_lower_var_copies.c @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "nir_types.h" +#include "compiler/nir_types.h" /* * Lowers all copy intrinsics to sequences of load/store intrinsics. |