commit 2190481ad9d497b704ccd9c516b49fd84115ac4c
author Stephen White <senorblanco@chromium.org> Mon Jan 24 22:51:49 2022 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jan 24 22:51:49 2022 +0000
tree e67acbe4c51620f02fc5cdc1b2f4580bb41c9bd2
parent 6c0df4421124f43f1660a18ac7e68b87204fe79e

GLSL: avoid collisions on existing vars for binding 0/0.

Bug: tint:1396
Change-Id: I870c3dd7772b1fdf9bf7adfdb34798a9eb170163
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/78020
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>

src/transform/combine_samplers.cc

diff --git a/src/transform/combine_samplers.cc b/src/transform/combine_samplers.cc
index ce20657..86ee8ae 100644
--- a/src/transform/combine_samplers.cc
+++ b/src/transform/combine_samplers.cc
@@ -137,6 +137,13 @@
     for (auto* var : ctx.src->AST().GlobalVariables()) {
       if (sem.Get(var->type)->IsAnyOf<sem::Texture, sem::Sampler>()) {
         ctx.Remove(ctx.src->AST().GlobalDeclarations(), var);
+      } else if (auto binding_point = var->BindingPoint()) {
+        if (binding_point.group->value == 0 &&
+            binding_point.binding->value == 0) {
+          auto* decoration =
+              ctx.dst->Disable(ast::DisabledValidation::kBindingPointCollision);
+          ctx.InsertFront(var->decorations, decoration);
+        }
       }
     }
 

src/transform/combine_samplers_test.cc

diff --git a/src/transform/combine_samplers_test.cc b/src/transform/combine_samplers_test.cc
index 60f836c..7d49756 100644
--- a/src/transform/combine_samplers_test.cc
+++ b/src/transform/combine_samplers_test.cc
@@ -633,7 +633,7 @@
 }
 )";
   auto* expect = R"(
-@group(0) @binding(0) var<uniform> gcoords : vec2<f32>;
+@internal(disable_validation__binding_point_collision) @group(0) @binding(0) var<uniform> gcoords : vec2<f32>;
 
 @group(0) @binding(0) @internal(disable_validation__binding_point_collision) var tex_samp : texture_2d<f32>;