commit 81addb75cb5d3e7f49c3b3635cf6006066055ba5
author Austin Eng <enga@chromium.org> Wed May 12 17:01:01 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Wed May 12 17:01:01 2021 +0000
tree e3b0877d3f35bdefe2d59d8c86ad32d65c881354
parent 88d3afe19c6190daae86a9c6033b66d15c53f8b8

Pass mayCollide argument to Tint's BindingRemapper

Added in https://dawn-review.googlesource.com/c/tint/+/50742
Bindings may not collide except on the D3D12 backend where we use
the register offset as the binding number. Offsets may alias if
they are for different HLSL register types (buffer, texture, etc.)

Bug: tint:797
Change-Id: I020e3b5cd1d35fdf5678b587225507e0cf24f5b3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/50801
Commit-Queue: Austin Eng <enga@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
Auto-Submit: Austin Eng <enga@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/dawn_native/d3d12/ShaderModuleD3D12.cpp

diff --git a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
index 1392b2f..c554dac 100644
--- a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
+++ b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
@@ -258,8 +258,11 @@
         transformManager.Add<tint::transform::Renamer>();
         transformManager.Add<tint::transform::Hlsl>();
 
+        // D3D12 registers like `t3` and `c3` have the same bindingOffset number in the
+        // remapping but should not be considered a collision because they have different types.
+        const bool mayCollide = true;
         transformInputs.Add<BindingRemapper::Remappings>(std::move(bindingPoints),
-                                                         std::move(accessControls));
+                                                         std::move(accessControls), mayCollide);
 
         tint::Program program;
         tint::transform::DataMap transformOutputs;

src/dawn_native/vulkan/ShaderModuleVk.cpp

diff --git a/src/dawn_native/vulkan/ShaderModuleVk.cpp b/src/dawn_native/vulkan/ShaderModuleVk.cpp
index 2f09efa..2e256da 100644
--- a/src/dawn_native/vulkan/ShaderModuleVk.cpp
+++ b/src/dawn_native/vulkan/ShaderModuleVk.cpp
@@ -172,7 +172,8 @@
 
         tint::transform::DataMap transformInputs;
         transformInputs.Add<BindingRemapper::Remappings>(std::move(bindingPoints),
-                                                         std::move(accessControls));
+                                                         std::move(accessControls),
+                                                         /* mayCollide */ false);
 
         tint::Program program;
         DAWN_TRY_ASSIGN(program, RunTransforms(&transformManager, GetTintProgram(), transformInputs,