Fixup remapped binding group for MSL options.
When building the new multiplanar_external_texture options from the
bindings data the remapper has already run. This means that the group
used in the new MSL bindings will always be `0`, not the original group
binding number.
This CL updates the options generation to use the correct `0` value.
Bug: chromium:1515439
Change-Id: I4ab77ae28b4c2447b7d5db0787e0ceb3ede4da70
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/168241
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
(cherry picked from commit b91578ac795715992d291da26f614b6ce3b106bf)
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/168660
diff --git a/src/tint/lang/msl/writer/common/option_helpers.cc b/src/tint/lang/msl/writer/common/option_helpers.cc
index cda70c6..2561e9f 100644
--- a/src/tint/lang/msl/writer/common/option_helpers.cc
+++ b/src/tint/lang/msl/writer/common/option_helpers.cc
@@ -153,7 +153,8 @@
}
// The remapped binding data and external texture data need to coordinate in order to put things in
-// the correct place when we're done.
+// the correct place when we're done. The binding remapper is run first, so make sure that the
+// external texture uses the new binding point.
//
// When the data comes in we have a list of all WGSL origin (group,binding) pairs to MSL
// (binding) in the `uniform`, `storage`, `texture`, and `sampler` arrays.
@@ -193,9 +194,10 @@
BindingPoint plane1_binding_point{0, plane1.binding};
BindingPoint metadata_binding_point{0, metadata.binding};
- // Use the re-bound msl plane0 value for the lookup key.
+ // Use the re-bound MSL plane0 value for the lookup key. The group goes to `0` which is the
+ // value always used for re-bound data.
external_texture.bindings_map.emplace(
- BindingPoint{src_binding_point.group, plane0_binding_point.binding},
+ BindingPoint{0, plane0_binding_point.binding},
ExternalTextureOptions::BindingPoints{plane1_binding_point, metadata_binding_point});
// Bindings which go to the same slot in MSL do not need to be re-bound.
