diff options
| author | Dylan Baker <[email protected]> | 2018-09-14 12:57:32 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2020-04-21 11:09:04 -0700 |
| commit | 8e3696137f2cb7b4f5a3824f26186ecbb06f9282 (patch) | |
| tree | 4494df8d138aaf2bab2feafa832f68e9fdf9bfb1 /src/compiler | |
| parent | 289f02d1d5990e052e21eb250f6d40b47d6eb12f (diff) | |
remove final imports.h and imports.c bits
This moves the fi_types to a new mesa_private.h and removes the
imports.c file. The vast majority of this patch is just removing
pound includes of imports.h and fixing up the recursive includes.
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/glsl_to_nir.cpp | 3 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_opt_copy_propagate.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 3731e7a0b74..a6fc2671880 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -37,7 +37,6 @@ #include "compiler/nir/nir_builtin_builder.h" #include "compiler/nir/nir_deref.h" #include "main/errors.h" -#include "util/imports.h" #include "main/mtypes.h" #include "main/shaderobj.h" #include "util/u_math.h" @@ -903,7 +902,7 @@ deref_get_qualifier(nir_deref_instr *deref) if (field->memory_restrict) qualifiers |= ACCESS_RESTRICT; } - + parent_type = cur->type; } diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 72713fa2e66..8a876fcecee 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -86,7 +86,7 @@ #include "util/u_string.h" #include "util/u_math.h" -#include "util/imports.h" + #include "main/shaderobj.h" #include "main/enums.h" #include "main/mtypes.h" diff --git a/src/compiler/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c index 4a98a2812c3..794d9bcf19d 100644 --- a/src/compiler/nir/nir_opt_copy_propagate.c +++ b/src/compiler/nir/nir_opt_copy_propagate.c @@ -26,7 +26,6 @@ */ #include "nir.h" -#include <util/imports.h> /** * SSA-based copy propagation |