From c83ea206830cff4b435ddc1a531a392f6506d001 Mon Sep 17 00:00:00 2001
From: Konstantin Seurer <konstantin.seurer@gmail.com>
Date: Fri, 20 Jan 2023 19:55:30 +0100
Subject: [PATCH] radv/bvh: Move the size header field up

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20818>
---
 src/amd/vulkan/bvh/bvh.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/bvh/bvh.h b/src/amd/vulkan/bvh/bvh.h
index 56fe37864a4..2fbe6839fdb 100644
--- a/src/amd/vulkan/bvh/bvh.h
+++ b/src/amd/vulkan/bvh/bvh.h
@@ -92,14 +92,16 @@ struct radv_accel_struct_header {
    uint32_t reserved;
    radv_aabb aabb;
 
-   /* Everything after this gets updated/copied from the CPU. */
+   /* Everything after this gets either updated/copied from the CPU or written by header.comp. */
    uint64_t compacted_size;
    uint64_t serialization_size;
    uint32_t copy_dispatch_size[3];
+   uint64_t size;
+
+   /* Everything after this gets updated/copied from the CPU. */
    uint32_t geometry_count;
    uint64_t instance_offset;
    uint64_t instance_count;
-   uint64_t size;
    uint32_t build_flags;
 };