commit 360a1dc565e83da354030c0da753f6bbc8e3eb24
author Ben Clayton <bclayton@google.com> Thu Nov 09 12:28:35 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Nov 09 12:28:35 2023 +0000
tree aba3813bdf21feb78583a22e95a08ac6822b7635
parent d61514719334478955a230b597f57efec273e983

clang-format

Looks like the formatter has slightly changed rules, leading to changes.

Change-Id: I19b770ab1e1dd2ea401e7dae32824458c0ec0e59
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/159922
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/dawn/native/ApplyClearColorValueWithDrawHelper.cpp

diff --git a/src/dawn/native/ApplyClearColorValueWithDrawHelper.cpp b/src/dawn/native/ApplyClearColorValueWithDrawHelper.cpp
index e0ff1dd..f87f861 100644
--- a/src/dawn/native/ApplyClearColorValueWithDrawHelper.cpp
+++ b/src/dawn/native/ApplyClearColorValueWithDrawHelper.cpp
@@ -185,7 +185,7 @@
     DeviceBase* device,
     const RenderPassDescriptor* renderPassDescriptor,
     const KeyOfApplyClearColorValueWithDrawPipelines& key) {
-    std::array<uint8_t, sizeof(uint32_t)* 4 * kMaxColorAttachments> clearValues = {};
+    std::array<uint8_t, sizeof(uint32_t) * 4 * kMaxColorAttachments> clearValues = {};
     uint32_t offset = 0;
     for (uint32_t i : IterateBitSet(key.colorTargetsToApplyClearColorValue)) {
         const Format& format = renderPassDescriptor->colorAttachments[i].view->GetFormat();

src/dawn/tests/ParamGenerator.h

diff --git a/src/dawn/tests/ParamGenerator.h b/src/dawn/tests/ParamGenerator.h
index 22b7f4a..52fcefb 100644
--- a/src/dawn/tests/ParamGenerator.h
+++ b/src/dawn/tests/ParamGenerator.h
@@ -98,8 +98,10 @@
     struct StructName : BaseStructName, DAWN_PP_CONCATENATE(_Dawn_, StructName) {                  \
         template <typename... Args>                                                                \
         StructName(const BaseStructName& param, Args&&... args)                                    \
-            : BaseStructName(param),                                                               \
-              DAWN_PP_CONCATENATE(_Dawn_, StructName){std::forward<Args>(args)...} {}              \
+            : BaseStructName(param), DAWN_PP_CONCATENATE(_Dawn_, StructName) {                     \
+            std::forward<Args>(args)...                                                            \
+        }                                                                                          \
+        {}                                                                                         \
     };                                                                                             \
     inline std::ostream& operator<<(std::ostream& o, const StructName& param) {                    \
         o << static_cast<const BaseStructName&>(param);                                            \

src/dawn/tests/unittests/ITypBitsetTests.cpp

diff --git a/src/dawn/tests/unittests/ITypBitsetTests.cpp b/src/dawn/tests/unittests/ITypBitsetTests.cpp
index 177e733..bcaf23c 100644
--- a/src/dawn/tests/unittests/ITypBitsetTests.cpp
+++ b/src/dawn/tests/unittests/ITypBitsetTests.cpp
@@ -160,7 +160,7 @@
     Bitset bits = {1 << 1 | 1 << 2 | 1 << 7};
     ExpectBits(bits, {1, 2, 7});
 
-    Bitset bits2 = bits& Bitset{1 << 0 | 1 << 3 | 1 << 7};
+    Bitset bits2 = bits & Bitset{1 << 0 | 1 << 3 | 1 << 7};
     ExpectBits(bits2, {7});
     ExpectBits(bits, {1, 2, 7});