Add `default` to the `switch` blocks that contain `return`
This patch adds `default` to the `switch` blocks that contain
`return` statement to fix the CMake warning `not all control paths
return a value`.
Bug: 436300898
Change-Id: Ic1689c5f0d91f531d6d65ae64367bd97e0d31fac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/257201
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
diff --git a/src/dawn/native/d3d12/BindGroupLayoutD3D12.cpp b/src/dawn/native/d3d12/BindGroupLayoutD3D12.cpp
index f19a0bd..9441520 100644
--- a/src/dawn/native/d3d12/BindGroupLayoutD3D12.cpp
+++ b/src/dawn/native/d3d12/BindGroupLayoutD3D12.cpp
@@ -53,6 +53,7 @@
return D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
case wgpu::BufferBindingType::BindingNotUsed:
case wgpu::BufferBindingType::Undefined:
+ default:
DAWN_UNREACHABLE();
}
},
@@ -74,6 +75,7 @@
return D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
case wgpu::StorageTextureAccess::BindingNotUsed:
case wgpu::StorageTextureAccess::Undefined:
+ default:
DAWN_UNREACHABLE();
}
},
diff --git a/src/dawn/native/d3d12/CommandBufferD3D12.cpp b/src/dawn/native/d3d12/CommandBufferD3D12.cpp
index 5f3fc4b..a716efe 100644
--- a/src/dawn/native/d3d12/CommandBufferD3D12.cpp
+++ b/src/dawn/native/d3d12/CommandBufferD3D12.cpp
@@ -67,6 +67,8 @@
return DXGI_FORMAT_R16_UINT;
case wgpu::IndexFormat::Uint32:
return DXGI_FORMAT_R32_UINT;
+ default:
+ DAWN_UNREACHABLE();
}
}
@@ -76,6 +78,8 @@
return D3D12_QUERY_TYPE_BINARY_OCCLUSION;
case wgpu::QueryType::Timestamp:
return D3D12_QUERY_TYPE_TIMESTAMP;
+ default:
+ DAWN_UNREACHABLE();
}
}
diff --git a/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp b/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp
index ac8a22f..150a16f 100644
--- a/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp
+++ b/src/dawn/native/d3d12/PipelineLayoutD3D12.cpp
@@ -72,6 +72,7 @@
return D3D12_ROOT_PARAMETER_TYPE_SRV;
case wgpu::BufferBindingType::BindingNotUsed:
case wgpu::BufferBindingType::Undefined:
+ default:
DAWN_UNREACHABLE();
}
}
diff --git a/src/dawn/native/d3d12/QuerySetD3D12.cpp b/src/dawn/native/d3d12/QuerySetD3D12.cpp
index 5f44de8..17d9701 100644
--- a/src/dawn/native/d3d12/QuerySetD3D12.cpp
+++ b/src/dawn/native/d3d12/QuerySetD3D12.cpp
@@ -42,6 +42,8 @@
return D3D12_QUERY_HEAP_TYPE_OCCLUSION;
case wgpu::QueryType::Timestamp:
return D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
+ default:
+ DAWN_UNREACHABLE();
}
}
} // anonymous namespace
diff --git a/src/dawn/native/d3d12/RenderPassBuilderD3D12.cpp b/src/dawn/native/d3d12/RenderPassBuilderD3D12.cpp
index 8923348..3617709 100644
--- a/src/dawn/native/d3d12/RenderPassBuilderD3D12.cpp
+++ b/src/dawn/native/d3d12/RenderPassBuilderD3D12.cpp
@@ -48,8 +48,8 @@
return D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_PRESERVE;
case wgpu::LoadOp::Undefined:
+ default:
DAWN_UNREACHABLE();
- break;
}
}
@@ -60,8 +60,8 @@
case wgpu::StoreOp::Store:
return D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE;
case wgpu::StoreOp::Undefined:
+ default:
DAWN_UNREACHABLE();
- break;
}
}
diff --git a/src/dawn/native/d3d12/RenderPipelineD3D12.cpp b/src/dawn/native/d3d12/RenderPipelineD3D12.cpp
index 9928af8..ec98d48 100644
--- a/src/dawn/native/d3d12/RenderPipelineD3D12.cpp
+++ b/src/dawn/native/d3d12/RenderPipelineD3D12.cpp
@@ -301,6 +301,8 @@
return D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF;
case wgpu::IndexFormat::Undefined:
return D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED;
+ default:
+ DAWN_UNREACHABLE();
}
}
diff --git a/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.cpp b/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.cpp
index 7654eb8..7b52c67 100644
--- a/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.cpp
+++ b/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.cpp
@@ -80,6 +80,7 @@
case ResourceHeapKind::Default_OnlyRenderableOrDepthTextures:
return D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES;
case EnumCount:
+ default:
DAWN_UNREACHABLE();
}
}
diff --git a/src/dawn/native/d3d12/TextureD3D12.cpp b/src/dawn/native/d3d12/TextureD3D12.cpp
index bd86b66..0ce66ff 100644
--- a/src/dawn/native/d3d12/TextureD3D12.cpp
+++ b/src/dawn/native/d3d12/TextureD3D12.cpp
@@ -131,14 +131,15 @@
D3D12_RESOURCE_DIMENSION D3D12TextureDimension(wgpu::TextureDimension dimension) {
switch (dimension) {
- case wgpu::TextureDimension::Undefined:
- DAWN_UNREACHABLE();
case wgpu::TextureDimension::e1D:
return D3D12_RESOURCE_DIMENSION_TEXTURE1D;
case wgpu::TextureDimension::e2D:
return D3D12_RESOURCE_DIMENSION_TEXTURE2D;
case wgpu::TextureDimension::e3D:
return D3D12_RESOURCE_DIMENSION_TEXTURE3D;
+ case wgpu::TextureDimension::Undefined:
+ default:
+ DAWN_UNREACHABLE();
}
}
@@ -170,6 +171,7 @@
return D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3;
case wgpu::ComponentSwizzle::Undefined:
+ default:
DAWN_UNREACHABLE();
}
}
diff --git a/src/dawn/native/d3d12/UtilsD3D12.cpp b/src/dawn/native/d3d12/UtilsD3D12.cpp
index 0e90b60..3efb9b6 100644
--- a/src/dawn/native/d3d12/UtilsD3D12.cpp
+++ b/src/dawn/native/d3d12/UtilsD3D12.cpp
@@ -146,6 +146,7 @@
return D3D12_COMPARISON_FUNC_ALWAYS;
case wgpu::CompareFunction::Undefined:
+ default:
DAWN_UNREACHABLE();
}
}
@@ -448,6 +449,7 @@
case ResourceHeapKind::Custom_WriteBack_OnlyBuffers:
return D3D12_HEAP_TYPE_CUSTOM;
case EnumCount:
+ default:
DAWN_UNREACHABLE();
}
}
