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

Enable -Wunused-but-set-variable. 

Bug: chromium:1203071

Change-Id: I73e58baa9a581bfc72f191184998d68dba9941d6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/59720
Auto-Submit: Peter Kasting <pkasting@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Peter Kasting 2021-07-27 18:42:59 +00:00 committed by Dawn LUCI CQ
parent 08a3900522
commit 7e50a7fad3
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/BUILD.gn
View File

@ -120,6 +120,7 @@ config("dawn_internal") {
"-Wstrict-prototypes", "-Wstrict-prototypes",
"-Wtautological-unsigned-zero-compare", "-Wtautological-unsigned-zero-compare",
"-Wunreachable-code-aggressive", "-Wunreachable-code-aggressive",
"-Wunused-but-set-variable",
] ]
if (is_win) { if (is_win) {

1
src/dawn_native/ExternalTexture.cpp
View File

@ -59,6 +59,7 @@ namespace dawn_native {
const Format* format; const Format* format;
DAWN_TRY_ASSIGN(format, device->GetInternalFormat(descriptor->format)); DAWN_TRY_ASSIGN(format, device->GetInternalFormat(descriptor->format));
DAWN_UNUSED(format);
switch (descriptor->format) { switch (descriptor->format) {
case wgpu::TextureFormat::RGBA8Unorm: case wgpu::TextureFormat::RGBA8Unorm:

2
src/dawn_native/SubresourceStorage.h
View File

@ -393,13 +393,11 @@ namespace dawn_native {
ASSERT(mipLevel < mMipLevelCount); ASSERT(mipLevel < mMipLevelCount);
// Fastest path, the aspect is compressed! // Fastest path, the aspect is compressed!
uint32_t dataIndex = aspectIndex * mArrayLayerCount * mMipLevelCount;
if (mAspectCompressed[aspectIndex]) { if (mAspectCompressed[aspectIndex]) {
return DataInline(aspectIndex); return DataInline(aspectIndex);
} }
// Fast path, the array layer is compressed. // Fast path, the array layer is compressed.
dataIndex += arrayLayer * mMipLevelCount;
if (LayerCompressed(aspectIndex, arrayLayer)) { if (LayerCompressed(aspectIndex, arrayLayer)) {
return Data(aspectIndex, arrayLayer); return Data(aspectIndex, arrayLayer);
} }

3
src/dawn_native/d3d12/CommandBufferD3D12.cpp
View File

@ -987,7 +987,6 @@ namespace dawn_native { namespace d3d12 {
BindGroupStateTracker* bindingTracker, BindGroupStateTracker* bindingTracker,
const ComputePassResourceUsage& resourceUsages) { const ComputePassResourceUsage& resourceUsages) {
uint64_t currentDispatch = 0; uint64_t currentDispatch = 0;
PipelineLayout* lastLayout = nullptr;
ID3D12GraphicsCommandList* commandList = commandContext->GetCommandList(); ID3D12GraphicsCommandList* commandList = commandContext->GetCommandList();
Command type; Command type;
@ -1035,8 +1034,6 @@ namespace dawn_native { namespace d3d12 {
commandList->SetPipelineState(pipeline->GetPipelineState()); commandList->SetPipelineState(pipeline->GetPipelineState());
bindingTracker->OnSetPipeline(pipeline); bindingTracker->OnSetPipeline(pipeline);
lastLayout = layout;
break; break;
} }

2
src/dawn_native/d3d12/ResidencyManagerD3D12.cpp
View File

@ -184,6 +184,7 @@ namespace dawn_native { namespace d3d12 {
uint64_t bytesEvicted; uint64_t bytesEvicted;
DAWN_TRY_ASSIGN(bytesEvicted, DAWN_TRY_ASSIGN(bytesEvicted,
EnsureCanMakeResident(allocationSize, GetMemorySegmentInfo(memorySegment))); EnsureCanMakeResident(allocationSize, GetMemorySegmentInfo(memorySegment)));
DAWN_UNUSED(bytesEvicted);
return {}; return {};
} }
@ -298,6 +299,7 @@ namespace dawn_native { namespace d3d12 {
ID3D12Pageable** allocations) { ID3D12Pageable** allocations) {
uint64_t bytesEvicted; uint64_t bytesEvicted;
DAWN_TRY_ASSIGN(bytesEvicted, EnsureCanMakeResident(sizeToMakeResident, segment)); DAWN_TRY_ASSIGN(bytesEvicted, EnsureCanMakeResident(sizeToMakeResident, segment));
DAWN_UNUSED(bytesEvicted);
// Note that MakeResident is a synchronous function and can add a significant // Note that MakeResident is a synchronous function and can add a significant
// overhead to command recording. In the future, it may be possible to decrease this // overhead to command recording. In the future, it may be possible to decrease this