From 102789886cd8e27ee5e115ebefc270be2393b389 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 9 Dec 2019 15:41:52 -0500 Subject: [PATCH] panfrost: Move nir_undef_to_zero to Midgard compiler Nothing Gallium about it. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/Makefile.sources | 1 - src/gallium/drivers/panfrost/meson.build | 1 - src/panfrost/Makefile.sources | 1 + src/panfrost/midgard/meson.build | 1 + .../panfrost/nir => panfrost/midgard}/nir_undef_to_zero.c | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename src/{gallium/drivers/panfrost/nir => panfrost/midgard}/nir_undef_to_zero.c (100%) diff --git a/src/gallium/drivers/panfrost/Makefile.sources b/src/gallium/drivers/panfrost/Makefile.sources index 5c1fc1f0a17..acca7d652e8 100644 --- a/src/gallium/drivers/panfrost/Makefile.sources +++ b/src/gallium/drivers/panfrost/Makefile.sources @@ -2,7 +2,6 @@ C_SOURCES := \ nir/nir_lower_blend.c \ nir/nir_lower_blend.h \ nir/nir_lower_framebuffer.c \ - nir/nir_undef_to_zero.c \ \ pan_afbc.c \ pan_allocate.c \ diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index ca9f6b7afb6..feecbbdb363 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -26,7 +26,6 @@ files_panfrost = files( 'pan_resource.c', 'pan_resource.h', - 'nir/nir_undef_to_zero.c', 'nir/nir_lower_blend.c', 'nir/nir_lower_framebuffer.c', diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index 2dd2571b036..44ee76188b4 100644 --- a/src/panfrost/Makefile.sources +++ b/src/panfrost/Makefile.sources @@ -48,6 +48,7 @@ midgard_FILES := \ midgard/mir.c \ midgard/mir_promote_uniforms.c \ midgard/mir_squeeze.c \ + midgard/nir_undef_to_zero.c \ midgard/lcra.c shared_FILES := \ diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build index e60b338546b..ddc6ad3c639 100644 --- a/src/panfrost/midgard/meson.build +++ b/src/panfrost/midgard/meson.build @@ -38,6 +38,7 @@ libpanfrost_midgard_files = files( 'midgard_opt_float.c', 'midgard_opt_perspective.c', 'midgard_errata_lod.c', + 'nir_undef_to_zero.c', 'disassemble.c', 'lcra.c' ) diff --git a/src/gallium/drivers/panfrost/nir/nir_undef_to_zero.c b/src/panfrost/midgard/nir_undef_to_zero.c similarity index 100% rename from src/gallium/drivers/panfrost/nir/nir_undef_to_zero.c rename to src/panfrost/midgard/nir_undef_to_zero.c -- 2.30.2