From 5de89fe2ffa9c25c04360fcce65b805f638edb39 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 1 Mar 2020 21:38:18 -0800 Subject: [PATCH] st/nine: Fix incompatible-pointer-types-discards-qualifiers errors. ../src/gallium/state_trackers/nine/nine_ff.c:129:28: error: initializing 'struct nine_ff_vs_key *' with an expression of type 'const void *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] struct nine_ff_vs_key *vs = key; ^ ~~~ ../src/gallium/state_trackers/nine/nine_ff.c:145:28: error: initializing 'struct nine_ff_ps_key *' with an expression of type 'const void *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] struct nine_ff_ps_key *ps = key; ^ ~~~ Fixes: fdd96578ef2d ("nine: Add state tracker nine for Direct3D9 (v3)") Signed-off-by: Vinson Lee Reviewed-by: Andre Heider Tested-by: Marge Bot Part-of: (cherry picked from commit 5ffa6eab88332982466f7ba420eb804ed7f97694) --- .pick_status.json | 2 +- src/gallium/state_trackers/nine/nine_ff.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3a09a08b6f2..8a315a8c368 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -193,7 +193,7 @@ "description": "st/nine: Fix incompatible-pointer-types-discards-qualifiers errors.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "fdd96578ef2dfe9c4ad5aab5858036298d444a64" }, diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/state_trackers/nine/nine_ff.c index 5e756b36707..7b67f0ff9fd 100644 --- a/src/gallium/state_trackers/nine/nine_ff.c +++ b/src/gallium/state_trackers/nine/nine_ff.c @@ -126,7 +126,7 @@ struct nine_ff_ps_key static unsigned nine_ff_vs_key_hash(void *key) { - struct nine_ff_vs_key *vs = key; + const struct nine_ff_vs_key *vs = key; unsigned i; uint32_t hash = vs->value32[0]; for (i = 1; i < ARRAY_SIZE(vs->value32); ++i) @@ -142,7 +142,7 @@ static int nine_ff_vs_key_comp(void *key1, void *key2) } static unsigned nine_ff_ps_key_hash(void *key) { - struct nine_ff_ps_key *ps = key; + const struct nine_ff_ps_key *ps = key; unsigned i; uint32_t hash = ps->value32[0]; for (i = 1; i < ARRAY_SIZE(ps->value32); ++i)