diff --git a/src/gallium/drivers/panfrost/Makefile.sources b/src/gallium/drivers/panfrost/Makefile.sources index 145959a3d68..d858d474870 100644 --- a/src/gallium/drivers/panfrost/Makefile.sources +++ b/src/gallium/drivers/panfrost/Makefile.sources @@ -1,7 +1,4 @@ C_SOURCES := \ - nir/nir_lower_blend.c \ - nir/nir_lower_blend.h \ - \ pan_assemble.c \ pan_blend_cso.c \ pan_blend_cso.h \ diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index 36da44cc918..66647c9b7c5 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -25,9 +25,6 @@ files_panfrost = files( 'pan_screen.h', 'pan_resource.c', 'pan_resource.h', - - 'nir/nir_lower_blend.c', - 'pan_context.c', 'pan_blit.c', 'pan_job.c', diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.c b/src/gallium/drivers/panfrost/pan_blend_shaders.c index 21a4a2720da..4d0166e43c0 100644 --- a/src/gallium/drivers/panfrost/pan_blend_shaders.c +++ b/src/gallium/drivers/panfrost/pan_blend_shaders.c @@ -29,7 +29,7 @@ #include "pan_util.h" #include "panfrost-quirks.h" #include "compiler/nir/nir_builder.h" -#include "nir/nir_lower_blend.h" +#include "panfrost/util/nir_lower_blend.h" #include "panfrost/util/pan_lower_framebuffer.h" #include "gallium/auxiliary/util/u_blend.h" #include "util/u_memory.h" diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index 71fc9b5e9ff..fcf96821f0f 100644 --- a/src/panfrost/Makefile.sources +++ b/src/panfrost/Makefile.sources @@ -98,6 +98,8 @@ shared_FILES := \ util_FILES := \ util/lcra.c \ util/lcra.h \ + util/nir_lower_blend.c \ + util/nir_lower_blend.h \ util/nir_mod_helpers.c \ util/pan_ir.c \ util/pan_ir.h \ diff --git a/src/panfrost/util/meson.build b/src/panfrost/util/meson.build index 75f9024eafb..23110d7f268 100644 --- a/src/panfrost/util/meson.build +++ b/src/panfrost/util/meson.build @@ -22,6 +22,7 @@ libpanfrost_util_files = files( 'lcra.c', 'lcra.h', + 'nir_lower_blend.c', 'nir_mod_helpers.c', 'pan_ir.c', 'pan_ir.h', diff --git a/src/gallium/drivers/panfrost/nir/nir_lower_blend.c b/src/panfrost/util/nir_lower_blend.c similarity index 100% rename from src/gallium/drivers/panfrost/nir/nir_lower_blend.c rename to src/panfrost/util/nir_lower_blend.c diff --git a/src/gallium/drivers/panfrost/nir/nir_lower_blend.h b/src/panfrost/util/nir_lower_blend.h similarity index 100% rename from src/gallium/drivers/panfrost/nir/nir_lower_blend.h rename to src/panfrost/util/nir_lower_blend.h