AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Add a bunch of -Wpadded errors

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28615>
This commit is contained in:
Faith Ekstrand
2024-04-06 22:03:35 -05:00
parent 987cbaee2a
commit 6ea591d372
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nouveau/vulkan/nvk_descriptor_set.h
View File

@@ -20,26 +20,35 @@ struct nvk_descriptor_set_layout;
#define NVK_IMAGE_DESCRIPTOR_IMAGE_INDEX_MASK 0x000fffff
#define NVK_IMAGE_DESCRIPTOR_SAMPLER_INDEX_MASK 0xfff00000
PRAGMA_DIAGNOSTIC_PUSH
PRAGMA_DIAGNOSTIC_ERROR(-Wpadded)
struct nvk_sampled_image_descriptor {
unsigned image_index:20;
unsigned sampler_index:12;
};
PRAGMA_DIAGNOSTIC_POP
static_assert(sizeof(struct nvk_sampled_image_descriptor) == 4,
"nvk_sampled_image_descriptor has no holes");
PRAGMA_DIAGNOSTIC_PUSH
PRAGMA_DIAGNOSTIC_ERROR(-Wpadded)
struct nvk_storage_image_descriptor {
unsigned image_index:20;
unsigned sw_log2:2;
unsigned sh_log2:2;
unsigned pad:8;
};
PRAGMA_DIAGNOSTIC_POP
static_assert(sizeof(struct nvk_storage_image_descriptor) == 4,
"nvk_storage_image_descriptor has no holes");
PRAGMA_DIAGNOSTIC_PUSH
PRAGMA_DIAGNOSTIC_ERROR(-Wpadded)
struct nvk_buffer_view_descriptor {
unsigned image_index:20;
unsigned pad:12;
};
PRAGMA_DIAGNOSTIC_POP
static_assert(sizeof(struct nvk_buffer_view_descriptor) == 4,
"nvk_buffer_view_descriptor has no holes");

3
src/nouveau/vulkan/nvk_shader.h
View File

@@ -46,6 +46,8 @@ enum ENUM_PACKED nvk_cbuf_type {
NVK_CBUF_TYPE_UBO_DESC,
};
PRAGMA_DIAGNOSTIC_PUSH
PRAGMA_DIAGNOSTIC_ERROR(-Wpadded)
struct nvk_cbuf {
enum nvk_cbuf_type type;
uint8_t desc_set;
@@ -53,6 +55,7 @@ struct nvk_cbuf {
uint8_t _pad;
uint32_t desc_offset;
};
PRAGMA_DIAGNOSTIC_POP
static_assert(sizeof(struct nvk_cbuf) == 8, "This struct has no holes");
struct nvk_cbuf_map {