From 7f7e772bdf78a0123c17bb60df2f53e7ae7d7382 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Fri, 23 Aug 2024 17:31:32 +0200
Subject: [PATCH] panvk: Don't make panvk_device size gen dependent

The panvk_device is used in gen-agnostic path, and which means we can't
make its size dependent on PAN_ARCH.

Fixes: 5067921349a9 ("panvk: Switch to vk_meta")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Rebecca Mckeever <rebecca.mckeever@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: John Anthony <john.anthony@arm.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30969>
---
 src/panfrost/vulkan/panvk_device.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_device.h b/src/panfrost/vulkan/panvk_device.h
index 04d364251a2..3b405ef8045 100644
--- a/src/panfrost/vulkan/panvk_device.h
+++ b/src/panfrost/vulkan/panvk_device.h
@@ -56,12 +56,10 @@ struct panvk_device {
    struct panvk_blend_shader_cache blend_shader_cache;
    struct vk_meta_device meta;
 
-#if PAN_ARCH <= 7
    struct {
       struct panvk_priv_mem shader;
       struct panvk_priv_mem rsd;
    } desc_copy;
-#endif
 
    struct {
       struct panvk_pool rw;