From 566d7f25b864ee5df0a463b06841f3d033049812 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Mon, 11 Apr 2022 15:50:50 +0000 Subject: [PATCH] Enable empty_if_body lint. This CL updates the one instance of an empty if body in Dawn to remove the if. This allows enabling the empty_if_body lint check. Change-Id: I5c05db828e8033b4f3155a34c3a6723bfd3181d6 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86082 Reviewed-by: Corentin Wallez Commit-Queue: Dan Sinclair Auto-Submit: Dan Sinclair --- src/dawn/CPPLINT.cfg | 1 - src/dawn/native/RenderPassEncoder.cpp | 43 +++++++++++++-------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/dawn/CPPLINT.cfg b/src/dawn/CPPLINT.cfg index b172426856..27dc5d4ec9 100644 --- a/src/dawn/CPPLINT.cfg +++ b/src/dawn/CPPLINT.cfg @@ -10,4 +10,3 @@ filter=-readability/namespace filter=-runtime/explicit filter=-runtime/indentation_namespace filter=-runtime/int -filter=-whitespace/empty_if_body diff --git a/src/dawn/native/RenderPassEncoder.cpp b/src/dawn/native/RenderPassEncoder.cpp index b7f756338d..31e740d689 100644 --- a/src/dawn/native/RenderPassEncoder.cpp +++ b/src/dawn/native/RenderPassEncoder.cpp @@ -131,31 +131,30 @@ namespace dawn::native { } void RenderPassEncoder::APIEnd() { - if (mEncodingContext->TryEncode( - this, - [&](CommandAllocator* allocator) -> MaybeError { - if (IsValidationEnabled()) { - DAWN_TRY(ValidateProgrammableEncoderEnd()); + mEncodingContext->TryEncode( + this, + [&](CommandAllocator* allocator) -> MaybeError { + if (IsValidationEnabled()) { + DAWN_TRY(ValidateProgrammableEncoderEnd()); - DAWN_INVALID_IF( - mOcclusionQueryActive, - "Render pass %s ended with incomplete occlusion query index %u of %s.", - this, mCurrentOcclusionQueryIndex, mOcclusionQuerySet.Get()); - } + DAWN_INVALID_IF( + mOcclusionQueryActive, + "Render pass %s ended with incomplete occlusion query index %u of %s.", + this, mCurrentOcclusionQueryIndex, mOcclusionQuerySet.Get()); + } - EndRenderPassCmd* cmd = - allocator->Allocate(Command::EndRenderPass); - // The query availability has already been updated at the beginning of render - // pass, and no need to do update here. - cmd->timestampWrites = std::move(mTimestampWritesAtEnd); + EndRenderPassCmd* cmd = + allocator->Allocate(Command::EndRenderPass); + // The query availability has already been updated at the beginning of render + // pass, and no need to do update here. + cmd->timestampWrites = std::move(mTimestampWritesAtEnd); - DAWN_TRY(mEncodingContext->ExitRenderPass(this, std::move(mUsageTracker), - mCommandEncoder.Get(), - std::move(mIndirectDrawMetadata))); - return {}; - }, - "encoding %s.End().", this)) { - } + DAWN_TRY(mEncodingContext->ExitRenderPass(this, std::move(mUsageTracker), + mCommandEncoder.Get(), + std::move(mIndirectDrawMetadata))); + return {}; + }, + "encoding %s.End().", this); } void RenderPassEncoder::APIEndPass() {