From 33ccf9ff92799f70be6b1fb5c2ee2da6876cae9b Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 20 Sep 2022 10:12:50 +0200 Subject: [PATCH] mesa/st: always use normalized coords for samplers Normalized samplers is the norm, and non-normalized samplers might cause some drivers and hardware to have to bend over backwards a bit. We're using TXF here anyway, so it doesn't really matter what we set this state to. So let's always use normalized samplers instead of always using non-normalized samplers. That makes things easier for everyone. Fixes: 41e093fc98c ("st/pbo: add a fast pbo download code-path") Reviewed-By: Mike Blumenkrantz Part-of: (cherry picked from commit 1a135bdd6ce39f155e92b881829d642664a5fcfd) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_cb_texture.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 917371cc9d4..6407d07bdb3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1885,7 +1885,7 @@ "description": "mesa/st: always use normalized coords for samplers", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "41e093fc98c269279a100c3dd25ed911a7eeec58" }, diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 485a056acfc..319b4bad068 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1782,6 +1782,7 @@ try_pbo_download(struct st_context *st, struct pipe_sampler_view templ; struct pipe_sampler_view *sampler_view; struct pipe_sampler_state sampler = {0}; + sampler.normalized_coords = true; const struct pipe_sampler_state *samplers[1] = {&sampler}; unsigned level = texImage->TexObject->Attrib.MinLevel + texImage->Level; unsigned max_layer = util_max_layer(texture, level);