encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update tools/format 

This Cl updates tools/format to match the various Dawn extensions and to
use the `clang_format.py` file from depot_tools instead of the one from
clang. This fixes up some formatting differences so `tools/format` will
now match `git cl format`.

Bug: dawn:1339
Change-Id: I32a2cdbd2d7e950794268616fae38b5bf54ab370
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86874
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
dan sinclair 2022-04-19 14:44:14 +00:00 committed by Dawn LUCI CQ
parent f80a759897
commit f0469eb65a
5 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/dawn/native/Limits.cpp
View File

@ -151,14 +151,14 @@ namespace dawn::native {
Limits ReifyDefaultLimits(const Limits& limits) { Limits ReifyDefaultLimits(const Limits& limits) {
Limits out; Limits out;
#define X(Class, limitName, base, ...) \ #define X(Class, limitName, base, ...) \
if (IsLimitUndefined(limits.limitName) || \ if (IsLimitUndefined(limits.limitName) || \
CheckLimit<LimitClass::Class>::IsBetter( \ CheckLimit<LimitClass::Class>::IsBetter(static_cast<decltype(limits.limitName)>(base), \
static_cast<decltype(limits.limitName)>(base), limits.limitName)) { \ limits.limitName)) { \
/* If the limit is undefined or the default is better, use the default */ \ /* If the limit is undefined or the default is better, use the default */ \
out.limitName = base; \ out.limitName = base; \
} else { \ } else { \
out.limitName = limits.limitName; \ out.limitName = limits.limitName; \
} }
LIMITS(X) LIMITS(X)
#undef X #undef X
@ -166,11 +166,11 @@ namespace dawn::native {
} }
MaybeError ValidateLimits(const Limits& supportedLimits, const Limits& requiredLimits) { MaybeError ValidateLimits(const Limits& supportedLimits, const Limits& requiredLimits) {
#define X(Class, limitName, ...) \ #define X(Class, limitName, ...) \
if (!IsLimitUndefined(requiredLimits.limitName)) { \ if (!IsLimitUndefined(requiredLimits.limitName)) { \
DAWN_TRY_CONTEXT(CheckLimit<LimitClass::Class>::Validate( \ DAWN_TRY_CONTEXT(CheckLimit<LimitClass::Class>::Validate(supportedLimits.limitName, \
supportedLimits.limitName, requiredLimits.limitName), \ requiredLimits.limitName), \
"validating " #limitName); \ "validating " #limitName); \
} }
LIMITS(X) LIMITS(X)
#undef X #undef X
@ -192,17 +192,17 @@ namespace dawn::native {
} \ } \
} }
#define X_CHECK_BETTER_AND_CLAMP(Class, limitName, ...) \ #define X_CHECK_BETTER_AND_CLAMP(Class, limitName, ...) \
{ \ { \
constexpr std::array<decltype(Limits::limitName), kTierCount> tiers{__VA_ARGS__}; \ constexpr std::array<decltype(Limits::limitName), kTierCount> tiers{__VA_ARGS__}; \
decltype(Limits::limitName) tierValue = tiers[i - 1]; \ decltype(Limits::limitName) tierValue = tiers[i - 1]; \
if (CheckLimit<LimitClass::Class>::IsBetter(tierValue, limits.limitName)) { \ if (CheckLimit<LimitClass::Class>::IsBetter(tierValue, limits.limitName)) { \
/* The tier is better. Go to the next tier. */ \ /* The tier is better. Go to the next tier. */ \
continue; \ continue; \
} else if (tierValue != limits.limitName) { \ } else if (tierValue != limits.limitName) { \
/* Better than the tier. Degrade |limits| to the tier. */ \ /* Better than the tier. Degrade |limits| to the tier. */ \
limits.limitName = tiers[i - 1]; \ limits.limitName = tiers[i - 1]; \
} \ } \
} }
LIMITS_EACH_GROUP(X_EACH_GROUP) LIMITS_EACH_GROUP(X_EACH_GROUP)

2
src/dawn/node/interop/Core.h
View File

@ -119,7 +119,7 @@ namespace wgpu::interop {
// stringified values append to the error message. // stringified values append to the error message.
// If Result is a success, then a success Result is returned. // If Result is a success, then a success Result is returned.
template <typename... VALUES> template <typename... VALUES>
Result Append(VALUES&&... values) { Result Append(VALUES && ... values) {
if (*this) { if (*this) {
return *this; return *this;
} }

22
src/dawn/tests/unittests/wire/WireErrorCallbackTests.cpp
View File

@ -271,18 +271,18 @@ TEST_F(WireErrorCallbackTests, PopErrorScopeAfterDisconnect) {
// Empty stack (We are emulating the errors that would be callback-ed from native). // Empty stack (We are emulating the errors that would be callback-ed from native).
TEST_F(WireErrorCallbackTests, PopErrorScopeEmptyStack) { TEST_F(WireErrorCallbackTests, PopErrorScopeEmptyStack) {
WGPUErrorCallback callback; WGPUErrorCallback callback;
void* userdata; void* userdata;
EXPECT_CALL(api, OnDevicePopErrorScope(apiDevice, _, _)) EXPECT_CALL(api, OnDevicePopErrorScope(apiDevice, _, _))
.WillOnce(DoAll(SaveArg<1>(&callback), SaveArg<2>(&userdata), Return(true))); .WillOnce(DoAll(SaveArg<1>(&callback), SaveArg<2>(&userdata), Return(true)));
wgpuDevicePopErrorScope(device, ToMockDevicePopErrorScopeCallback, this); wgpuDevicePopErrorScope(device, ToMockDevicePopErrorScopeCallback, this);
FlushClient(); FlushClient();
EXPECT_CALL(*mockDevicePopErrorScopeCallback, EXPECT_CALL(*mockDevicePopErrorScopeCallback,
Call(WGPUErrorType_Validation, StrEq("No error scopes to pop"), this)) Call(WGPUErrorType_Validation, StrEq("No error scopes to pop"), this))
.Times(1); .Times(1);
callback(WGPUErrorType_Validation, "No error scopes to pop", userdata); callback(WGPUErrorType_Validation, "No error scopes to pop", userdata);
FlushServer(); FlushServer();
} }
// Test the return wire for device lost callback // Test the return wire for device lost callback

1
src/tint/reader/spirv/parser_impl_module_var_test.cc
View File

@ -1272,7 +1272,6 @@ TEST_F(SpvModuleScopeVarParserTest, DescriptorGroupDecoration_Valid) {
<< module_str; << module_str;
} }
TEST_F(SpvModuleScopeVarParserTest, BindingDecoration_Valid) { TEST_F(SpvModuleScopeVarParserTest, BindingDecoration_Valid) {
auto p = parser(test::Assemble(Preamble() + FragMain() + R"( auto p = parser(test::Assemble(Preamble() + FragMain() + R"(
OpDecorate %1 DescriptorSet 0 ; WGSL validation requires this already OpDecorate %1 DescriptorSet 0 ; WGSL validation requires this already

10
tools/format
View File

@ -13,7 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
find src -name "*.h" -exec clang-format -i {} \; find src -name "*.h" -exec clang_format.py -i {} \;
find src -name "*.cc" -exec clang-format -i {} \; find src -name "*.cc" -exec clang_format.py -i {} \;
find src/tint/cmd -name "*.h" -exec clang-format -i {} \; find src -name "*.cpp" -exec clang_format.py -i {} \;
find src/tint/cmd -name "*.cc" -exec clang-format -i {} \; find src -name "*.m" -exec clang_format.py -i {} \;
find src -name "*.mm" -exec clang_format.py -i {} \;
find include -name "*.h" -exec clang_format.py -i {} \;