commit 0a58972309ef4f999d885d1493be31ed2cefad4a
author Austin Eng <enga@chromium.org> Tue Jul 13 15:34:46 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 13 15:34:46 2021 +0000
tree 713483628273b7fd4dadd86fb7e2d72bfadc11ba
parent 4773e8d0f9808854bc1c765181218605f36ad0eb

Always run the Tint renamer, even with dump_translated_shaders

Not running the renamer can produce code that fails to compile
on the backend, resulting in device lost errors.

Change-Id: I4a841a281142bb8eda1402e1ebd6a5d23b77bfe0
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/57745
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>

src/dawn_native/d3d12/ShaderModuleD3D12.cpp

diff --git a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
index 0ea9acb..d8b742a 100644
--- a/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
+++ b/src/dawn_native/d3d12/ShaderModuleD3D12.cpp
@@ -258,10 +258,7 @@
                 layout->GetFirstIndexOffsetRegisterSpace());
         }
         transformManager.Add<tint::transform::BindingRemapper>();
-
-        if (!GetDevice()->IsToggleEnabled(Toggle::DumpTranslatedShaders)) {
-            transformManager.Add<tint::transform::Renamer>();
-        }
+        transformManager.Add<tint::transform::Renamer>();
 
         // 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.
@@ -292,11 +289,7 @@
             }
             *remappedEntryPointName = it->second;
         } else {
-            if (GetDevice()->IsToggleEnabled(Toggle::DumpTranslatedShaders)) {
-                *remappedEntryPointName = entryPointName;
-            } else {
-                return DAWN_VALIDATION_ERROR("Transform output missing renamer data.");
-            }
+            return DAWN_VALIDATION_ERROR("Transform output missing renamer data.");
         }
 
         tint::writer::hlsl::Options options;

src/dawn_native/metal/ShaderModuleMTL.mm

diff --git a/src/dawn_native/metal/ShaderModuleMTL.mm b/src/dawn_native/metal/ShaderModuleMTL.mm
index bbbe86c..d8afff5 100644
--- a/src/dawn_native/metal/ShaderModuleMTL.mm
+++ b/src/dawn_native/metal/ShaderModuleMTL.mm
@@ -123,10 +123,7 @@
             transformManager.Add<tint::transform::BoundArrayAccessors>();
         }
         transformManager.Add<tint::transform::BindingRemapper>();
-
-        if (!GetDevice()->IsToggleEnabled(Toggle::DumpTranslatedShaders)) {
-            transformManager.Add<tint::transform::Renamer>();
-        }
+        transformManager.Add<tint::transform::Renamer>();
 
         transformInputs.Add<BindingRemapper::Remappings>(std::move(bindingPoints),
                                                          std::move(accessControls),
@@ -144,11 +141,7 @@
             }
             *remappedEntryPointName = it->second;
         } else {
-            if (GetDevice()->IsToggleEnabled(Toggle::DumpTranslatedShaders)) {
-                *remappedEntryPointName = entryPointName;
-            } else {
-                return DAWN_VALIDATION_ERROR("Transform output missing renamer data.");
-            }
+            return DAWN_VALIDATION_ERROR("Transform output missing renamer data.");
         }
 
         tint::writer::msl::Options options;