Mesa (master): radv: fix size of sqtt_file_chunk_asic_info on 32-bit system

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 02f3af2ad1eb1732d0bfb781de5e781bf83b400d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=02f3af2ad1eb1732d0bfb781de5e781bf83b400d

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Feb 28 15:37:34 2020 +0100

radv: fix size of sqtt_file_chunk_asic_info on 32-bit system

The struct is actually 716 bytes, but on 64-bit systems the compiler
aligns it to 720. Add padding to make sure it's always 720.

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2580
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2578
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3996>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3996>

---

 src/amd/vulkan/radv_rgp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/amd/vulkan/radv_rgp.c b/src/amd/vulkan/radv_rgp.c
index e19667f7678..3daef62ed5f 100644
--- a/src/amd/vulkan/radv_rgp.c
+++ b/src/amd/vulkan/radv_rgp.c
@@ -270,6 +270,7 @@ struct sqtt_file_chunk_asic_info {
 	uint32_t lds_granularity;
 	uint16_t cu_mask[SQTT_MAX_NUM_SE][SQTT_SA_PER_SE];
 	char reserved1[128];
+	char padding[4];
 };
 
 static_assert(sizeof(struct sqtt_file_chunk_asic_info) == 720,