From 7ff8b043ebd5c3500aab342627fff710a6375ab8 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 3 Sep 2025 13:57:15 +0200 Subject: [PATCH] pvr: use pvr_memlayout instead of uint32_t The circular include dependency has already been resolved, when this was moved to pvr_common.h instead of pvr_private.h. So let's use the actual type and delete the comment here. Reviewed-by: Simon Perretta Part-of: --- src/imagination/vulkan/pvr_job_render.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/imagination/vulkan/pvr_job_render.h b/src/imagination/vulkan/pvr_job_render.h index 3f3d9e367bf..66343dc20e5 100644 --- a/src/imagination/vulkan/pvr_job_render.h +++ b/src/imagination/vulkan/pvr_job_render.h @@ -29,6 +29,7 @@ #include #include "hwdef/rogue_hw_defs.h" +#include "pvr_common.h" #include "pvr_csb.h" #include "pvr_limits.h" #include "pvr_types.h" @@ -112,15 +113,7 @@ struct pvr_render_job { VkExtent2D physical_extent; uint32_t layer_size; enum ROGUE_CR_ZLS_FORMAT_TYPE zls_format; - /* FIXME: This should be of type 'enum pvr_memlayout', but this is defined - * in pvr_private.h, which causes a circular include dependency. For now, - * treat it as a uint32_t. A couple of ways to possibly fix this: - * - * 1. Merge the contents of this header file into pvr_private.h. - * 2. Move 'enum pvr_memlayout' into it a new header that can be - * included by both this header and pvr_private.h. - */ - uint32_t memlayout; + enum pvr_memlayout memlayout; /* TODO: Is this really necessary? Maybe we can extract all useful * information and drop this member. */