From 349219df6a819db4982233d3d89834496afd532f Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 13 Nov 2025 22:05:17 -0500 Subject: [PATCH] poly: Rename poly_nir_lower_gs.h to poly_nir.h It has all the poly NIR things so it should have a more generic name. Acked-by: Alyssa Rosenzweig Reviewed-by: Mary Guillemard Part-of: --- src/asahi/lib/agx_nir_prolog_epilog.c | 2 +- src/asahi/vulkan/hk_cmd_dispatch.c | 1 - src/asahi/vulkan/hk_cmd_draw.c | 1 - src/asahi/vulkan/hk_shader.c | 2 +- src/asahi/vulkan/hk_shader.h | 2 +- src/gallium/drivers/asahi/agx_nir_lower_sysvals.c | 2 +- src/gallium/drivers/asahi/agx_state.c | 1 - src/gallium/drivers/asahi/agx_state.h | 2 +- src/poly/nir/{poly_nir_lower_gs.h => poly_nir.h} | 0 src/poly/nir/poly_nir_lower_gs.c | 2 +- src/poly/nir/poly_nir_lower_tess.c | 2 +- src/poly/nir/poly_nir_lower_vs.c | 7 +------ 12 files changed, 8 insertions(+), 16 deletions(-) rename src/poly/nir/{poly_nir_lower_gs.h => poly_nir.h} (100%) diff --git a/src/asahi/lib/agx_nir_prolog_epilog.c b/src/asahi/lib/agx_nir_prolog_epilog.c index 93d19ec6b1b..fe5d3bd07c5 100644 --- a/src/asahi/lib/agx_nir_prolog_epilog.c +++ b/src/asahi/lib/agx_nir_prolog_epilog.c @@ -6,7 +6,7 @@ #include "gallium/include/pipe/p_defines.h" #include "poly/cl/libpoly.h" -#include "poly/nir/poly_nir_lower_gs.h" +#include "poly/nir/poly_nir.h" #include "util/format/u_formats.h" #include "agx_abi.h" #include "agx_linker.h" diff --git a/src/asahi/vulkan/hk_cmd_dispatch.c b/src/asahi/vulkan/hk_cmd_dispatch.c index b8eab93c4d6..7cb08bb1d3c 100644 --- a/src/asahi/vulkan/hk_cmd_dispatch.c +++ b/src/asahi/vulkan/hk_cmd_dispatch.c @@ -5,7 +5,6 @@ * SPDX-License-Identifier: MIT */ #include "libagx/query.h" -#include "poly/nir/poly_nir_lower_gs.h" #include "vulkan/vulkan_core.h" #include "agx_helpers.h" #include "agx_linker.h" diff --git a/src/asahi/vulkan/hk_cmd_draw.c b/src/asahi/vulkan/hk_cmd_draw.c index d04fe080082..65974b99350 100644 --- a/src/asahi/vulkan/hk_cmd_draw.c +++ b/src/asahi/vulkan/hk_cmd_draw.c @@ -5,7 +5,6 @@ * SPDX-License-Identifier: MIT */ #include -#include "poly/nir/poly_nir_lower_gs.h" #include "agx_abi.h" #include "agx_bg_eot.h" #include "agx_bo.h" diff --git a/src/asahi/vulkan/hk_shader.c b/src/asahi/vulkan/hk_shader.c index ba04645022b..ad939fdfb57 100644 --- a/src/asahi/vulkan/hk_shader.c +++ b/src/asahi/vulkan/hk_shader.c @@ -8,7 +8,7 @@ */ #include "hk_shader.h" -#include "poly/nir/poly_nir_lower_gs.h" +#include "poly/nir/poly_nir.h" #include "agx_debug.h" #include "agx_device.h" #include "agx_helpers.h" diff --git a/src/asahi/vulkan/hk_shader.h b/src/asahi/vulkan/hk_shader.h index 0add2ffe018..1b921e05483 100644 --- a/src/asahi/vulkan/hk_shader.h +++ b/src/asahi/vulkan/hk_shader.h @@ -8,7 +8,7 @@ #pragma once #include "asahi/compiler/agx_compile.h" -#include "poly/nir/poly_nir_lower_gs.h" +#include "poly/nir/poly_nir.h" #include "util/macros.h" #include "agx_linker.h" #include "agx_nir_lower_vbo.h" diff --git a/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c b/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c index 1767febc216..202b7c1420a 100644 --- a/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c +++ b/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c @@ -5,7 +5,7 @@ #include "compiler/nir/nir_builder.h" #include "pipe/p_defines.h" -#include "poly/nir/poly_nir_lower_gs.h" +#include "poly/nir/poly_nir.h" #include "util/bitset.h" #include "util/u_dynarray.h" #include "agx_abi.h" diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index aa279abda26..7d0aaa64b41 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -35,7 +35,6 @@ #include "pipe/p_screen.h" #include "pipe/p_state.h" #include "poly/geometry.h" -#include "poly/nir/poly_nir_lower_gs.h" #include "util/bitscan.h" #include "util/bitset.h" #include "util/blend.h" diff --git a/src/gallium/drivers/asahi/agx_state.h b/src/gallium/drivers/asahi/agx_state.h index 38395a6359e..23d425137de 100644 --- a/src/gallium/drivers/asahi/agx_state.h +++ b/src/gallium/drivers/asahi/agx_state.h @@ -25,7 +25,7 @@ #include "gallium/include/pipe/p_state.h" #include "pipe/p_defines.h" #include "poly/geometry.h" -#include "poly/nir/poly_nir_lower_gs.h" +#include "poly/nir/poly_nir.h" #include "util/bitset.h" #include "util/disk_cache.h" #include "util/hash_table.h" diff --git a/src/poly/nir/poly_nir_lower_gs.h b/src/poly/nir/poly_nir.h similarity index 100% rename from src/poly/nir/poly_nir_lower_gs.h rename to src/poly/nir/poly_nir.h diff --git a/src/poly/nir/poly_nir_lower_gs.c b/src/poly/nir/poly_nir_lower_gs.c index 5b79464ffba..5c7a7a79f73 100644 --- a/src/poly/nir/poly_nir_lower_gs.c +++ b/src/poly/nir/poly_nir_lower_gs.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: MIT */ -#include "poly/nir/poly_nir_lower_gs.h" +#include "poly/nir/poly_nir.h" #include "compiler/nir/nir_builder.h" #include "gallium/include/pipe/p_defines.h" #include "poly/cl/libpoly.h" diff --git a/src/poly/nir/poly_nir_lower_tess.c b/src/poly/nir/poly_nir_lower_tess.c index 3fceb1a0926..d00aa76c775 100644 --- a/src/poly/nir/poly_nir_lower_tess.c +++ b/src/poly/nir/poly_nir_lower_tess.c @@ -5,7 +5,7 @@ #include "poly/cl/libpoly.h" #include "poly/geometry.h" -#include "poly/nir/poly_nir_lower_gs.h" +#include "poly/nir/poly_nir.h" #include "util/bitscan.h" #include "util/macros.h" #include "nir.h" diff --git a/src/poly/nir/poly_nir_lower_vs.c b/src/poly/nir/poly_nir_lower_vs.c index 8e055036a4b..7323518bd0f 100644 --- a/src/poly/nir/poly_nir_lower_vs.c +++ b/src/poly/nir/poly_nir_lower_vs.c @@ -5,15 +5,10 @@ #include "compiler/nir/nir_builder.h" #include "poly/cl/libpoly.h" +#include "poly/nir/poly_nir.h" #include "poly/geometry.h" #include "nir.h" -/* XXX: Remove me later */ -nir_def *poly_nir_load_vertex_id(struct nir_builder *b, nir_def *id, - unsigned index_size_B); - -bool poly_nir_lower_sw_vs(struct nir_shader *s, unsigned index_size_B); - /* * This file implements basic input assembly in software. It runs on software * vertex shaders, as part of geometry/tessellation lowering. It does not apply