diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-07-10 09:51:32 -0700 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2019-07-10 10:43:23 -0700 |
| commit | c2c8983cf4029a3b427e67f7046efda50689df60 (patch) | |
| tree | 4614f00ed9f3a61c798447446018b3bfceac1f92 /src/gallium | |
| parent | ef2d5777693ac821a68b7ed10417204273a496d9 (diff) | |
panfrost: Move midgard/nir* to nir folder
The reason for doing this is two-fold:
1. These passes are likely to be shared with the Bifrost compiler
Therefore, we don't want to restrict them to Midgard
2. The coding style is different (NIR-style vs Panfrost-style)
The NIR passes are candidates for moving upstream into
compiler/nir, so don't block that off for stylistic reasons
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/panfrost/meson.build | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/nir/nir_lower_blend.c (renamed from src/gallium/drivers/panfrost/midgard/nir_lower_blend.c) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/nir/nir_lower_blend.h (renamed from src/gallium/drivers/panfrost/midgard/nir_lower_blend.h) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/nir/nir_lower_framebuffer.c (renamed from src/gallium/drivers/panfrost/midgard/nir_lower_framebuffer.c) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/nir/nir_undef_to_zero.c (renamed from src/gallium/drivers/panfrost/midgard/nir_undef_to_zero.c) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_blend_shaders.c | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index e1faa104f6b..f3067c6a784 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -35,13 +35,13 @@ files_panfrost = files( 'midgard/midgard_ra_pipeline.c', 'midgard/midgard_liveness.c', 'midgard/midgard_ops.c', - - 'midgard/nir_undef_to_zero.c', - 'midgard/nir_lower_blend.c', - 'midgard/nir_lower_framebuffer.c', 'midgard/cppwrap.cpp', 'midgard/disassemble.c', + 'nir/nir_undef_to_zero.c', + 'nir/nir_lower_blend.c', + 'nir/nir_lower_framebuffer.c', + 'bifrost/disassemble.c', 'pandecode/common.c', diff --git a/src/gallium/drivers/panfrost/midgard/nir_lower_blend.c b/src/gallium/drivers/panfrost/nir/nir_lower_blend.c index 0fadeba6674..0fadeba6674 100644 --- a/src/gallium/drivers/panfrost/midgard/nir_lower_blend.c +++ b/src/gallium/drivers/panfrost/nir/nir_lower_blend.c diff --git a/src/gallium/drivers/panfrost/midgard/nir_lower_blend.h b/src/gallium/drivers/panfrost/nir/nir_lower_blend.h index 7a2df6e5e29..7a2df6e5e29 100644 --- a/src/gallium/drivers/panfrost/midgard/nir_lower_blend.h +++ b/src/gallium/drivers/panfrost/nir/nir_lower_blend.h diff --git a/src/gallium/drivers/panfrost/midgard/nir_lower_framebuffer.c b/src/gallium/drivers/panfrost/nir/nir_lower_framebuffer.c index fe6ae121a4c..fe6ae121a4c 100644 --- a/src/gallium/drivers/panfrost/midgard/nir_lower_framebuffer.c +++ b/src/gallium/drivers/panfrost/nir/nir_lower_framebuffer.c diff --git a/src/gallium/drivers/panfrost/midgard/nir_undef_to_zero.c b/src/gallium/drivers/panfrost/nir/nir_undef_to_zero.c index 447aaebae5c..447aaebae5c 100644 --- a/src/gallium/drivers/panfrost/midgard/nir_undef_to_zero.c +++ b/src/gallium/drivers/panfrost/nir/nir_undef_to_zero.c diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.c b/src/gallium/drivers/panfrost/pan_blend_shaders.c index 993b612ee50..7e29e1eb430 100644 --- a/src/gallium/drivers/panfrost/pan_blend_shaders.c +++ b/src/gallium/drivers/panfrost/pan_blend_shaders.c @@ -27,7 +27,7 @@ #include "pan_util.h" #include "midgard/midgard_compile.h" #include "compiler/nir/nir_builder.h" -#include "midgard/nir_lower_blend.h" +#include "nir/nir_lower_blend.h" #include "gallium/auxiliary/util/u_blend.h" #include "util/u_memory.h" |