From d7517afa810c1e94fc4170e5ea3e903114a9de24 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Fri, 2 Feb 2024 11:45:25 +0100
Subject: [PATCH] panvk: Make panvk_pipeline_layout per-gen

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Rebecca Mckeever <rebecca.mckeever@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28170>
---
 src/panfrost/vulkan/panvk_pipeline_layout.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_pipeline_layout.h b/src/panfrost/vulkan/panvk_pipeline_layout.h
index 70e811e6352..21d4c602e6a 100644
--- a/src/panfrost/vulkan/panvk_pipeline_layout.h
+++ b/src/panfrost/vulkan/panvk_pipeline_layout.h
@@ -6,6 +6,10 @@
 #ifndef PANVK_PIPELINE_LAYOUT_H
 #define PANVK_PIPELINE_LAYOUT_H
 
+#ifndef PAN_ARCH
+#error "PAN_ARCH must be defined"
+#endif
+
 #include <stdint.h>
 
 #include "vk_pipeline_layout.h"
@@ -48,13 +52,11 @@ struct panvk_pipeline_layout {
 VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_pipeline_layout, vk.base, VkPipelineLayout,
                                VK_OBJECT_TYPE_PIPELINE_LAYOUT)
 
-#ifdef PAN_ARCH
 unsigned panvk_per_arch(pipeline_layout_ubo_start)(
    const struct panvk_pipeline_layout *layout, unsigned set, bool is_dynamic);
 
 unsigned panvk_per_arch(pipeline_layout_ubo_index)(
    const struct panvk_pipeline_layout *layout, unsigned set, unsigned binding,
    unsigned array_index);
-#endif
 
 #endif