commit | e2dd30f50890ac1fc3aa5b6d6784fc72d30b0a7c | [log] [tgz] |
---|---|---|
author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | Tue Mar 30 21:50:04 2021 +0200 |
committer | Commit Bot <commit-bot@chromium.org> | Thu Apr 08 16:07:24 2021 +0000 |
tree | 371c0573aeabe2de4ca1fbdd459c356a21884abe | |
parent | caa1032108075f0b23f75b63b7d11b5f1d8e2f72 [diff] |
BACKPORT: mesa/st: ignore texture_index if tex_instr has deref src texture_index is meaningless when a tex_instr has deref src. Use var->data.binding instead. CC: mesa-stable Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Acked-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9931> (cherry picked from commit e4ef5f043315e9f06bfb082b867dc08efe310d55) Signed-off-by: dannywang <danny.wang@amd.corp-partner.google.com> BUG=b:182752588 TEST=build and update arc-mesa-amd on DUT Conflicts: src/mesa/state_tracker/st_nir_lower_tex_src_plane.c - Resloved in the context of this mesa-amd Change-Id: I8979e4843fb9bdba0d92db8052a4cbdd69e1f459 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/mesa/+/2807201 Reviewed-by: Drew Davenport <ddavenport@chromium.org> Commit-Queue: Drew Davenport <ddavenport@chromium.org> Tested-by: Drew Davenport <ddavenport@chromium.org> (cherry picked from commit 98ccf7d4c85a35a5a526da326126aba688a39cdc) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/mesa/+/2809678