From 04ed77a1aea135a51ea8c6594950d48f321d1d9e Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 19 Dec 2023 21:13:16 -0800 Subject: [PATCH] etnaviv: Remove duplicate initializers Fix initializer-overrides warnings. ../src/gallium/drivers/etnaviv/etnaviv_compiler.c:62:29: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] 62 | .lower_extract_byte = true, | ^~~~ ../src/gallium/drivers/etnaviv/etnaviv_compiler.c:63:29: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] 63 | .lower_extract_word = true, | ^~~~ Fixes: 9dc4ee91215 ("etnaviv: lower (un)pack_{2x16,2x32}_split and extract_{byte,word}") Signed-off-by: Vinson Lee Reviewed-by: Lucas Stach Reviewed-by: Christian Gmeiner Part-of: (cherry picked from commit f5d08bdf4e3a0e75a846b76889e234b7c9bbd754) --- .pick_status.json | 2 +- src/gallium/drivers/etnaviv/etnaviv_compiler.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1fcc51a9e19..79d95f48cf1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -74,7 +74,7 @@ "description": "etnaviv: Remove duplicate initializers", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9dc4ee91215cfd5ea6d98c4879abc4e7979b4c64", "notes": null diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c b/src/gallium/drivers/etnaviv/etnaviv_compiler.c index f25250c12a8..afc70cfcb3c 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c @@ -54,8 +54,6 @@ etna_compiler_create(const char *renderer, const struct etna_specs *specs) .lower_fmod = true, .lower_vector_cmp = true, .lower_fdph = true, - .lower_extract_byte = true, - .lower_extract_word = true, .lower_insert_byte = true, .lower_insert_word = true, .lower_fdiv = true, /* !specs->has_new_transcendentals */