From 987cbaee2a4a6fdcd2f152816a616f4e8d29c60e Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Sat, 6 Apr 2024 22:04:03 -0500 Subject: [PATCH] nvk: Add a _pad field to nvk_fs_key Fixes: ae171458827b ("nak: Rewrite nir_intrinsic_load_sample_pos...") Reviewed-by: Alyssa Rosenzweig Part-of: --- src/nouveau/compiler/nak.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/nouveau/compiler/nak.h b/src/nouveau/compiler/nak.h index 99cec0754cd..fcbee883c82 100644 --- a/src/nouveau/compiler/nak.h +++ b/src/nouveau/compiler/nak.h @@ -32,6 +32,8 @@ nak_nir_options(const struct nak_compiler *nak); void nak_optimize_nir(nir_shader *nir, const struct nak_compiler *nak); void nak_preprocess_nir(nir_shader *nir, const struct nak_compiler *nak); +PRAGMA_DIAGNOSTIC_PUSH +PRAGMA_DIAGNOSTIC_ERROR(-Wpadded) struct nak_fs_key { bool zs_self_dep; @@ -40,6 +42,8 @@ struct nak_fs_key { */ bool force_sample_shading; + uint8_t _pad; + /** * The constant buffer index and offset at which the sample locations table lives. * Each sample location is two 4-bit unorm values packed into an 8-bit value @@ -48,6 +52,9 @@ struct nak_fs_key { uint8_t sample_locations_cb; uint32_t sample_locations_offset; }; +PRAGMA_DIAGNOSTIC_POP +static_assert(sizeof(struct nak_fs_key) == 8, "This struct has no holes"); + void nak_postprocess_nir(nir_shader *nir, const struct nak_compiler *nak, nir_variable_mode robust2_modes,