From c2c8983cf4029a3b427e67f7046efda50689df60 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 10 Jul 2019 09:51:32 -0700 Subject: [PATCH] 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 --- src/gallium/drivers/panfrost/meson.build | 8 ++++---- .../drivers/panfrost/{midgard => nir}/nir_lower_blend.c | 0 .../drivers/panfrost/{midgard => nir}/nir_lower_blend.h | 0 .../panfrost/{midgard => nir}/nir_lower_framebuffer.c | 0 .../drivers/panfrost/{midgard => nir}/nir_undef_to_zero.c | 0 src/gallium/drivers/panfrost/pan_blend_shaders.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename src/gallium/drivers/panfrost/{midgard => nir}/nir_lower_blend.c (100%) rename src/gallium/drivers/panfrost/{midgard => nir}/nir_lower_blend.h (100%) rename src/gallium/drivers/panfrost/{midgard => nir}/nir_lower_framebuffer.c (100%) rename src/gallium/drivers/panfrost/{midgard => nir}/nir_undef_to_zero.c (100%) 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 similarity index 100% rename from src/gallium/drivers/panfrost/midgard/nir_lower_blend.c rename to 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 similarity index 100% rename from src/gallium/drivers/panfrost/midgard/nir_lower_blend.h rename to 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 similarity index 100% rename from src/gallium/drivers/panfrost/midgard/nir_lower_framebuffer.c rename to 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 similarity index 100% rename from src/gallium/drivers/panfrost/midgard/nir_undef_to_zero.c rename to 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" -- 2.30.2