From 908dde360adcbb8d4a2bb13b8cbcf3cf97eb4445 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 6 Aug 2021 12:24:09 +0200 Subject: [PATCH] panfrost: Stop including midgard_pack.h directly Include gen_macros.h instead so we can smoothly transition to per-gen XMLs. Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 2 -- src/panfrost/lib/decode.c | 2 +- src/panfrost/lib/pan_blend.c | 5 +---- src/panfrost/lib/pan_device.h | 2 +- src/panfrost/lib/pan_encoder.h | 2 +- src/panfrost/lib/pan_format.c | 1 - src/panfrost/lib/pan_pool.h | 2 +- src/panfrost/lib/pan_scoreboard.h | 2 +- src/panfrost/lib/pan_shader.h | 2 +- src/panfrost/lib/pan_texture.h | 2 +- src/panfrost/vulkan/panvk_descriptor_set.c | 2 +- src/panfrost/vulkan/panvk_varyings.h | 2 +- 12 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index a793ce9ffbd..29405f7fba7 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -47,8 +47,6 @@ #include "pan_indirect_dispatch.h" #include "pan_blitter.h" -#include "midgard_pack.h" - /* Statically assert that PIPE_* enums match the hardware enums. * (As long as they match, we don't need to translate them.) */ diff --git a/src/panfrost/lib/decode.c b/src/panfrost/lib/decode.c index b813138957f..9f5c9b6d7ec 100644 --- a/src/panfrost/lib/decode.c +++ b/src/panfrost/lib/decode.c @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #include #include #include diff --git a/src/panfrost/lib/pan_blend.c b/src/panfrost/lib/pan_blend.c index 083a58aab3d..195e95ceeda 100644 --- a/src/panfrost/lib/pan_blend.c +++ b/src/panfrost/lib/pan_blend.c @@ -32,10 +32,7 @@ #include "compiler/nir/nir_conversion_builder.h" #include "compiler/nir/nir_lower_blend.h" -/* Blending is shared across all supported Malis with only minor differences, - * so pin a particular version */ -#define ARCH 7 -#include +#include /* Fixed function blending */ diff --git a/src/panfrost/lib/pan_device.h b/src/panfrost/lib/pan_device.h index 699449c0a55..fbaa8cc4252 100644 --- a/src/panfrost/lib/pan_device.h +++ b/src/panfrost/lib/pan_device.h @@ -41,7 +41,7 @@ #include "pan_pool.h" #include "pan_util.h" -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/src/panfrost/lib/pan_encoder.h b/src/panfrost/lib/pan_encoder.h index b3ab48c7023..aa65b159e38 100644 --- a/src/panfrost/lib/pan_encoder.h +++ b/src/panfrost/lib/pan_encoder.h @@ -30,7 +30,7 @@ #include #include "util/format/u_format.h" #include "pan_bo.h" -#include "midgard_pack.h" +#include "gen_macros.h" /* Indices for named (non-XFB) varyings that are present. These are packed * tightly so they correspond to a bitfield present (P) indexed by (1 << diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index a549c0763ad..0c73f687df3 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -25,7 +25,6 @@ */ #include "gen_macros.h" -#include "midgard_pack.h" #include "pan_format.h" #include "util/format/u_format.h" diff --git a/src/panfrost/lib/pan_pool.h b/src/panfrost/lib/pan_pool.h index 9336080e2f6..0f2735c4dc5 100644 --- a/src/panfrost/lib/pan_pool.h +++ b/src/panfrost/lib/pan_pool.h @@ -26,7 +26,7 @@ #define __PAN_POOL_H__ #include -#include +#include #include "pan_bo.h" #include "util/u_dynarray.h" diff --git a/src/panfrost/lib/pan_scoreboard.h b/src/panfrost/lib/pan_scoreboard.h index c7854733cc9..78d5945a925 100644 --- a/src/panfrost/lib/pan_scoreboard.h +++ b/src/panfrost/lib/pan_scoreboard.h @@ -27,7 +27,7 @@ #ifndef __PAN_SCOREBOARD_H__ #define __PAN_SCOREBOARD_H__ -#include "midgard_pack.h" +#include "gen_macros.h" #include "pan_pool.h" struct pan_scoreboard { diff --git a/src/panfrost/lib/pan_shader.h b/src/panfrost/lib/pan_shader.h index 6fa37bb6a7f..ba9ce2facdb 100644 --- a/src/panfrost/lib/pan_shader.h +++ b/src/panfrost/lib/pan_shader.h @@ -29,7 +29,7 @@ #include "panfrost/util/pan_ir.h" #include "pan_device.h" -#include "midgard_pack.h" +#include "gen_macros.h" struct panfrost_device; diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index d8d9093f127..8d329e30ff1 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -32,7 +32,7 @@ #include "drm-uapi/drm_fourcc.h" #include "util/format/u_format.h" #include "compiler/shader_enums.h" -#include "midgard_pack.h" +#include "gen_macros.h" #include "pan_bo.h" #include "pan_device.h" #include "pan_util.h" diff --git a/src/panfrost/vulkan/panvk_descriptor_set.c b/src/panfrost/vulkan/panvk_descriptor_set.c index f0c415de0f4..e10a6cbdab2 100644 --- a/src/panfrost/vulkan/panvk_descriptor_set.c +++ b/src/panfrost/vulkan/panvk_descriptor_set.c @@ -37,7 +37,7 @@ #include "vk_util.h" #include "pan_bo.h" -#include "midgard_pack.h" +#include "gen_macros.h" VkResult panvk_CreateDescriptorSetLayout(VkDevice _device, diff --git a/src/panfrost/vulkan/panvk_varyings.h b/src/panfrost/vulkan/panvk_varyings.h index c1e9a0851f7..14dd5327ca7 100644 --- a/src/panfrost/vulkan/panvk_varyings.h +++ b/src/panfrost/vulkan/panvk_varyings.h @@ -28,7 +28,7 @@ #include "util/format/u_format.h" #include "compiler/shader_enums.h" -#include "midgard_pack.h" +#include "gen_macros.h" #include "panfrost-job.h" struct pan_pool;