fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 21:40:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Add a _pad field to nvk_fs_key

Browse source 
Fixes: ae17145882 ("nak: Rewrite nir_intrinsic_load_sample_pos...")
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28615>
(cherry picked from commit 987cbaee2a)
This commit is contained in:
Faith Ekstrand 2024-04-06 22:04:03 -05:00 • committed by Eric Engestrom
parent 3e9ac50d37
commit 60c8db6cd1
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1074,7 +1074,7 @@
"description": "nvk: Add a _pad field to nvk_fs_key",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ae171458827bb8fceb232b3a13f61920e87a0d3a",
"notes": null

7
src/nouveau/compiler/nak.h
View file

@ -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,