commit 643403d48e92ff1291a381a92ad8ac93145e5237
author Shrek Shao <shrekshao@google.com> Wed Oct 27 21:12:20 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Oct 27 21:12:20 2021 +0000
tree 3fceda78ad96f84b1ec4fbfa1929265906093b2a
parent c9b0df976aac05e5253d484070c73710171e9692

Prelanding CL for back merge Dawn CL 67600

There is a missing DeviceBase* name in function arg blocking
back merge of Dawn CL 67600.
Adding this should be fine with Dawn CL 65483 as well.
Also modify the and operator to unblock another compile failure
which is addressed in Dawn CL 66200

Bug: dawn:1169, chromium:1255745
Change-Id: Ib927310ba5ebfa2f9ee311207a4241fb8c039c9a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/67720
Commit-Queue: Shrek Shao <shrekshao@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn_native/ShaderModule.cpp

diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp
index 4c22706..43b9f1c 100644
--- a/src/dawn_native/ShaderModule.cpp
+++ b/src/dawn_native/ShaderModule.cpp
@@ -625,7 +625,7 @@
         }
 
         ResultOrError<EntryPointMetadataTable> ReflectShaderUsingTint(
-            DeviceBase*,
+            const DeviceBase* device,
             const tint::Program* program) {
             ASSERT(program->IsValid());
 

src/tests/end2end/QueryTests.cpp

diff --git a/src/tests/end2end/QueryTests.cpp b/src/tests/end2end/QueryTests.cpp
index 347ef04..20bd392 100644
--- a/src/tests/end2end/QueryTests.cpp
+++ b/src/tests/end2end/QueryTests.cpp
@@ -310,7 +310,7 @@
     // TODO(hao.x.li@intel.com): Investigate why it's failed on D3D12 on Nvidia when running with
     // the previous occlusion tests. Expect resolve to 0 for these unwritten queries but the
     // occlusion result of the previous tests is got.
-    DAWN_SUPPRESS_TEST_IF(IsD3D12() & IsNvidia());
+    DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
 
     constexpr uint32_t kQueryCount = 7;
 
@@ -370,7 +370,7 @@
     // TODO(hao.x.li@intel.com): Investigate why it's failed on D3D12 on Nvidia when running with
     // the previous occlusion tests. Expect resolve to 0 but the occlusion result of the previous
     // tests is got.
-    DAWN_SUPPRESS_TEST_IF(IsD3D12() & IsNvidia());
+    DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
 
     constexpr uint32_t kQueryCount = 1;