Move switch statement bodies to their own lines (#5493)

* Move switch statement bodies to their own lines

* format

---------

Co-authored-by: Yong He <yonghe@outlook.com>

8 files changed, 161 insertions, 77 deletions

diff --git a/tools/gfx/d3d12/d3d12-command-encoder.cpp b/tools/gfx/d3d12/d3d12-command-encoder.cpp
index f0b4b0dfc..bed31f2f5 100644
--- a/tools/gfx/d3d12/d3d12-command-encoder.cpp
+++ b/tools/gfx/d3d12/d3d12-command-encoder.cpp
@@ -24,10 +24,15 @@ int PipelineCommandEncoder::getBindPointIndex(PipelineType type)
 {
     switch (type)
     {
-    case PipelineType::Graphics:   return 0;
-    case PipelineType::Compute:    return 1;
-    case PipelineType::RayTracing: return 2;
-    default:                       assert(!"unknown pipeline type."); return -1;
+    case PipelineType::Graphics:
+        return 0;
+    case PipelineType::Compute:
+        return 1;
+    case PipelineType::RayTracing:
+        return 2;
+    default:
+        assert(!"unknown pipeline type.");
+        return -1;
     }
 }
 
@@ -124,7 +129,9 @@ Result PipelineCommandEncoder::_bindRenderState(
             d3dheap = m_transientHeap->getCurrentSamplerHeap().getHeap();
             m_commandBuffer->bindDescriptorHeaps();
             break;
-        default: assert(!"shouldn't be here"); return SLANG_FAIL;
+        default:
+            assert(!"shouldn't be here");
+            return SLANG_FAIL;
         }
 
         // Try again.
@@ -456,7 +463,8 @@ void ResourceCommandEncoderImpl::clearResourceView(
             }
             break;
         }
-    default: break;
+    default:
+        break;
     }
 }
 
diff --git a/tools/gfx/d3d12/d3d12-descriptor-heap.h b/tools/gfx/d3d12/d3d12-descriptor-heap.h
index 44d03b5b0..fc426237c 100644
--- a/tools/gfx/d3d12/d3d12-descriptor-heap.h
+++ b/tools/gfx/d3d12/d3d12-descriptor-heap.h
@@ -399,31 +399,44 @@ struct DescriptorHeapReference
     {
         switch (type)
         {
-        case Type::Linear:           return ptr.linearHeap->getCpuHandle(index);
-        case Type::General:          return ptr.generalHeap->getCpuHandle(index);
-        case Type::ExpandingGeneral: return ptr.generalExpandingHeap->getCpuHandle(index);
-        case Type::ExpandingLinear:  return ptr.linearExpandingHeap->getCpuHandle(index);
-        default:                     return D3D12_CPU_DESCRIPTOR_HANDLE();
+        case Type::Linear:
+            return ptr.linearHeap->getCpuHandle(index);
+        case Type::General:
+            return ptr.generalHeap->getCpuHandle(index);
+        case Type::ExpandingGeneral:
+            return ptr.generalExpandingHeap->getCpuHandle(index);
+        case Type::ExpandingLinear:
+            return ptr.linearExpandingHeap->getCpuHandle(index);
+        default:
+            return D3D12_CPU_DESCRIPTOR_HANDLE();
         }
     }
     D3D12_GPU_DESCRIPTOR_HANDLE getGpuHandle(int index) const
     {
         switch (type)
         {
-        case Type::Linear:           return ptr.linearHeap->getGpuHandle(index);
-        case Type::General:          return ptr.generalHeap->getGpuHandle(index);
-        case Type::ExpandingGeneral: return ptr.generalExpandingHeap->getGpuHandle(index);
-        default:                     return D3D12_GPU_DESCRIPTOR_HANDLE();
+        case Type::Linear:
+            return ptr.linearHeap->getGpuHandle(index);
+        case Type::General:
+            return ptr.generalHeap->getGpuHandle(index);
+        case Type::ExpandingGeneral:
+            return ptr.generalExpandingHeap->getGpuHandle(index);
+        default:
+            return D3D12_GPU_DESCRIPTOR_HANDLE();
         }
     }
     int allocate(int numDescriptors)
     {
         switch (type)
         {
-        case Type::Linear:           return ptr.linearHeap->allocate(numDescriptors);
-        case Type::General:          return ptr.generalHeap->allocate(numDescriptors);
-        case Type::ExpandingGeneral: return ptr.generalExpandingHeap->allocate(numDescriptors);
-        default:                     return ptr.linearExpandingHeap->allocate(numDescriptors);
+        case Type::Linear:
+            return ptr.linearHeap->allocate(numDescriptors);
+        case Type::General:
+            return ptr.generalHeap->allocate(numDescriptors);
+        case Type::ExpandingGeneral:
+            return ptr.generalExpandingHeap->allocate(numDescriptors);
+        default:
+            return ptr.linearExpandingHeap->allocate(numDescriptors);
         }
     }
     void free(int index, int count)
@@ -431,19 +444,27 @@ struct DescriptorHeapReference
         switch (type)
         {
         default:
-        case Type::Linear:           SLANG_ASSERT(!"Linear heap does not support free()."); break;
-        case Type::General:          return ptr.generalHeap->free(index, count);
-        case Type::ExpandingGeneral: return ptr.generalExpandingHeap->free(index, count);
+        case Type::Linear:
+            SLANG_ASSERT(!"Linear heap does not support free().");
+            break;
+        case Type::General:
+            return ptr.generalHeap->free(index, count);
+        case Type::ExpandingGeneral:
+            return ptr.generalExpandingHeap->free(index, count);
         }
     }
     void freeIfSupported(int index, int count)
     {
         switch (type)
         {
-        case Type::Linear:           return;
-        case Type::General:          return ptr.generalHeap->free(index, count);
-        case Type::ExpandingGeneral: return ptr.generalExpandingHeap->free(index, count);
-        default:                     break;
+        case Type::Linear:
+            return;
+        case Type::General:
+            return ptr.generalHeap->free(index, count);
+        case Type::ExpandingGeneral:
+            return ptr.generalExpandingHeap->free(index, count);
+        default:
+            break;
         }
     }
 };
diff --git a/tools/gfx/d3d12/d3d12-device.cpp b/tools/gfx/d3d12/d3d12-device.cpp
index f2b24ab5f..cb5404961 100644
--- a/tools/gfx/d3d12/d3d12-device.cpp
+++ b/tools/gfx/d3d12/d3d12-device.cpp
@@ -124,7 +124,8 @@ Result DeviceImpl::createBuffer(
         if (initialState != D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE)
             initialState = D3D12_RESOURCE_STATE_COMMON;
         break;
-    default: return SLANG_FAIL;
+    default:
+        return SLANG_FAIL;
     }
 
     // Create the resource.
@@ -774,7 +775,8 @@ Result DeviceImpl::initialize(const Desc& desc)
                 case D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_1:
                     m_features.add("programmable-sample-positions-1");
                     break;
-                default: break;
+                default:
+                    break;
                 }
             }
         }
@@ -1436,7 +1438,8 @@ Result DeviceImpl::createTextureView(
     bool isMultiSample = resourceImpl ? resourceImpl->getDesc()->sampleDesc.numSamples > 1 : false;
     switch (desc.type)
     {
-    default: return SLANG_FAIL;
+    default:
+        return SLANG_FAIL;
 
     case IResourceView::Type::RenderTarget:
         {
@@ -1516,8 +1519,11 @@ Result DeviceImpl::createTextureView(
                 rtvDesc.Texture3D.WSize =
                     (desc.subresourceRange.layerCount == 0) ? -1 : desc.subresourceRange.layerCount;
                 break;
-            case IResource::Type::Buffer: rtvDesc.ViewDimension = D3D12_RTV_DIMENSION_BUFFER; break;
-            default:                      return SLANG_FAIL;
+            case IResource::Type::Buffer:
+                rtvDesc.ViewDimension = D3D12_RTV_DIMENSION_BUFFER;
+                break;
+            default:
+                return SLANG_FAIL;
             }
             m_device->CreateRenderTargetView(
                 resourceImpl ? resourceImpl->m_resource.getResource() : nullptr,
@@ -1561,7 +1567,8 @@ Result DeviceImpl::createTextureView(
                 dsvDesc.Texture2DArray.ArraySize = desc.subresourceRange.layerCount;
                 dsvDesc.Texture2DArray.FirstArraySlice = desc.subresourceRange.baseArrayLayer;
                 break;
-            default: return SLANG_FAIL;
+            default:
+                return SLANG_FAIL;
             }
             m_device->CreateDepthStencilView(
                 resourceImpl ? resourceImpl->m_resource.getResource() : nullptr,
@@ -1637,7 +1644,8 @@ Result DeviceImpl::createTextureView(
                 d3d12desc.Texture3D.WSize =
                     resourceDesc.size.depth >> desc.subresourceRange.mipLevel;
                 break;
-            default: return SLANG_FAIL;
+            default:
+                return SLANG_FAIL;
             }
             m_device->CreateUnorderedAccessView(
                 resourceImpl->m_resource,
diff --git a/tools/gfx/d3d12/d3d12-helper-functions.cpp b/tools/gfx/d3d12/d3d12-helper-functions.cpp
index 3ce9b872e..9d218dae0 100644
--- a/tools/gfx/d3d12/d3d12-helper-functions.cpp
+++ b/tools/gfx/d3d12/d3d12-helper-functions.cpp
@@ -42,12 +42,16 @@ D3D12_RESOURCE_FLAGS calcResourceFlag(ResourceState state)
 {
     switch (state)
     {
-    case ResourceState::RenderTarget:          return D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+    case ResourceState::RenderTarget:
+        return D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
     case ResourceState::DepthRead:
-    case ResourceState::DepthWrite:            return D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
+    case ResourceState::DepthWrite:
+        return D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
     case ResourceState::UnorderedAccess:
-    case ResourceState::AccelerationStructure: return D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
-    default:                                   return D3D12_RESOURCE_FLAG_NONE;
+    case ResourceState::AccelerationStructure:
+        return D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
+    default:
+        return D3D12_RESOURCE_FLAG_NONE;
     }
 }
 
@@ -67,15 +71,19 @@ D3D12_RESOURCE_DIMENSION calcResourceDimension(IResource::Type type)
 {
     switch (type)
     {
-    case IResource::Type::Buffer:    return D3D12_RESOURCE_DIMENSION_BUFFER;
-    case IResource::Type::Texture1D: return D3D12_RESOURCE_DIMENSION_TEXTURE1D;
+    case IResource::Type::Buffer:
+        return D3D12_RESOURCE_DIMENSION_BUFFER;
+    case IResource::Type::Texture1D:
+        return D3D12_RESOURCE_DIMENSION_TEXTURE1D;
     case IResource::Type::TextureCube:
     case IResource::Type::Texture2D:
         {
             return D3D12_RESOURCE_DIMENSION_TEXTURE2D;
         }
-    case IResource::Type::Texture3D: return D3D12_RESOURCE_DIMENSION_TEXTURE3D;
-    default:                         return D3D12_RESOURCE_DIMENSION_UNKNOWN;
+    case IResource::Type::Texture3D:
+        return D3D12_RESOURCE_DIMENSION_TEXTURE3D;
+    default:
+        return D3D12_RESOURCE_DIMENSION_UNKNOWN;
     }
 }
 
@@ -83,12 +91,16 @@ DXGI_FORMAT getTypelessFormatFromDepthFormat(Format format)
 {
     switch (format)
     {
-    case Format::D16_UNORM:         return DXGI_FORMAT_R16_TYPELESS;
-    case Format::D32_FLOAT:         return DXGI_FORMAT_R32_TYPELESS;
-    case Format::D32_FLOAT_S8_UINT: return DXGI_FORMAT_R32G8X24_TYPELESS;
+    case Format::D16_UNORM:
+        return DXGI_FORMAT_R16_TYPELESS;
+    case Format::D32_FLOAT:
+        return DXGI_FORMAT_R32_TYPELESS;
+    case Format::D32_FLOAT_S8_UINT:
+        return DXGI_FORMAT_R32G8X24_TYPELESS;
     // case Format::D24_UNORM_S8_UINT:
     //     return DXGI_FORMAT_R24G8_TYPELESS;
-    default: return D3DUtil::getMapFormat(format);
+    default:
+        return D3DUtil::getMapFormat(format);
     }
 }
 
@@ -99,8 +111,10 @@ bool isTypelessDepthFormat(DXGI_FORMAT format)
     case DXGI_FORMAT_R16_TYPELESS:
     case DXGI_FORMAT_R32_TYPELESS:
     case DXGI_FORMAT_R32G8X24_TYPELESS:
-    case DXGI_FORMAT_R24G8_TYPELESS:    return true;
-    default:                            return false;
+    case DXGI_FORMAT_R24G8_TYPELESS:
+        return true;
+    default:
+        return false;
     }
 }
 
@@ -108,10 +122,12 @@ D3D12_FILTER_TYPE translateFilterMode(TextureFilteringMode mode)
 {
     switch (mode)
     {
-    default: return D3D12_FILTER_TYPE(0);
+    default:
+        return D3D12_FILTER_TYPE(0);
 
-#define CASE(SRC, DST) \
-    case TextureFilteringMode::SRC: return D3D12_FILTER_TYPE_##DST
+#define CASE(SRC, DST)              \
+    case TextureFilteringMode::SRC: \
+        return D3D12_FILTER_TYPE_##DST
 
         CASE(Point, POINT);
         CASE(Linear, LINEAR);
@@ -124,10 +140,12 @@ D3D12_FILTER_REDUCTION_TYPE translateFilterReduction(TextureReductionOp op)
 {
     switch (op)
     {
-    default: return D3D12_FILTER_REDUCTION_TYPE(0);
+    default:
+        return D3D12_FILTER_REDUCTION_TYPE(0);
 
-#define CASE(SRC, DST) \
-    case TextureReductionOp::SRC: return D3D12_FILTER_REDUCTION_TYPE_##DST
+#define CASE(SRC, DST)            \
+    case TextureReductionOp::SRC: \
+        return D3D12_FILTER_REDUCTION_TYPE_##DST
 
         CASE(Average, STANDARD);
         CASE(Comparison, COMPARISON);
@@ -142,10 +160,12 @@ D3D12_TEXTURE_ADDRESS_MODE translateAddressingMode(TextureAddressingMode mode)
 {
     switch (mode)
     {
-    default: return D3D12_TEXTURE_ADDRESS_MODE(0);
+    default:
+        return D3D12_TEXTURE_ADDRESS_MODE(0);
 
-#define CASE(SRC, DST) \
-    case TextureAddressingMode::SRC: return D3D12_TEXTURE_ADDRESS_MODE_##DST
+#define CASE(SRC, DST)               \
+    case TextureAddressingMode::SRC: \
+        return D3D12_TEXTURE_ADDRESS_MODE_##DST
 
         CASE(Wrap, WRAP);
         CASE(ClampToEdge, CLAMP);
@@ -165,8 +185,9 @@ D3D12_COMPARISON_FUNC translateComparisonFunc(ComparisonFunc func)
         // TODO: need to report failures
         return D3D12_COMPARISON_FUNC_ALWAYS;
 
-#define CASE(FROM, TO) \
-    case ComparisonFunc::FROM: return D3D12_COMPARISON_FUNC_##TO
+#define CASE(FROM, TO)         \
+    case ComparisonFunc::FROM: \
+        return D3D12_COMPARISON_FUNC_##TO
 
         CASE(Never, NEVER);
         CASE(Less, LESS);
@@ -236,7 +257,8 @@ void initSrvDesc(
                                               : subresourceRange.mipLevelCount;
             descOut.Texture3D.MostDetailedMip = subresourceRange.mipLevel;
             break;
-        default: assert(!"Unknown dimension");
+        default:
+            assert(!"Unknown dimension");
         }
     }
     else if (resourceType == IResource::Type::TextureCube)
@@ -324,7 +346,8 @@ void initSrvDesc(
                                               : subresourceRange.mipLevelCount;
             break;
 
-        default: assert(!"Unknown dimension");
+        default:
+            assert(!"Unknown dimension");
         }
     }
 }
@@ -503,16 +526,24 @@ Result createNullDescriptor(
             srvDesc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
             switch (bindingRange.resourceShape)
             {
-            case SLANG_TEXTURE_1D: srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE1D; break;
+            case SLANG_TEXTURE_1D:
+                srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE1D;
+                break;
             case SLANG_TEXTURE_1D_ARRAY:
                 srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE1DARRAY;
                 break;
-            case SLANG_TEXTURE_2D: srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; break;
+            case SLANG_TEXTURE_2D:
+                srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+                break;
             case SLANG_TEXTURE_2D_ARRAY:
                 srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2DARRAY;
                 break;
-            case SLANG_TEXTURE_3D:   srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE3D; break;
-            case SLANG_TEXTURE_CUBE: srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBE; break;
+            case SLANG_TEXTURE_3D:
+                srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE3D;
+                break;
+            case SLANG_TEXTURE_CUBE:
+                srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBE;
+                break;
             case SLANG_TEXTURE_CUBE_ARRAY:
                 srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURECUBEARRAY;
                 break;
@@ -522,7 +553,8 @@ Result createNullDescriptor(
             case SLANG_TEXTURE_2D_MULTISAMPLE_ARRAY:
                 srvDesc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY;
                 break;
-            default: return SLANG_OK;
+            default:
+                return SLANG_OK;
             }
             d3dDevice->CreateShaderResourceView(nullptr, &srvDesc, destDescriptor);
         }
@@ -533,25 +565,33 @@ Result createNullDescriptor(
             uavDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
             switch (bindingRange.resourceShape)
             {
-            case SLANG_TEXTURE_1D: uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE1D; break;
+            case SLANG_TEXTURE_1D:
+                uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE1D;
+                break;
             case SLANG_TEXTURE_1D_ARRAY:
                 uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE1DARRAY;
                 break;
-            case SLANG_TEXTURE_2D: uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D; break;
+            case SLANG_TEXTURE_2D:
+                uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D;
+                break;
             case SLANG_TEXTURE_2D_ARRAY:
                 uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2DARRAY;
                 break;
-            case SLANG_TEXTURE_3D:                   uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE3D; break;
+            case SLANG_TEXTURE_3D:
+                uavDesc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE3D;
+                break;
             case SLANG_TEXTURE_CUBE:
             case SLANG_TEXTURE_CUBE_ARRAY:
             case SLANG_TEXTURE_2D_MULTISAMPLE:
             case SLANG_TEXTURE_2D_MULTISAMPLE_ARRAY:
-            default:                                 return SLANG_OK;
+            default:
+                return SLANG_OK;
             }
             d3dDevice->CreateUnorderedAccessView(nullptr, nullptr, &uavDesc, destDescriptor);
         }
         break;
-    default: break;
+    default:
+        break;
     }
     return SLANG_OK;
 }
diff --git a/tools/gfx/d3d12/d3d12-query.cpp b/tools/gfx/d3d12/d3d12-query.cpp
index d0191e349..85f326b6e 100644
--- a/tools/gfx/d3d12/d3d12-query.cpp
+++ b/tools/gfx/d3d12/d3d12-query.cpp
@@ -25,7 +25,8 @@ Result QueryPoolImpl::init(const IQueryPool::Desc& desc, DeviceImpl* device)
         heapDesc.Type = D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
         m_queryType = D3D12_QUERY_TYPE_TIMESTAMP;
         break;
-    default: return SLANG_E_INVALID_ARG;
+    default:
+        return SLANG_E_INVALID_ARG;
     }
 
     // Create query heap.
diff --git a/tools/gfx/d3d12/d3d12-resource-views.cpp b/tools/gfx/d3d12/d3d12-resource-views.cpp
index a760caef8..1e1439d66 100644
--- a/tools/gfx/d3d12/d3d12-resource-views.cpp
+++ b/tools/gfx/d3d12/d3d12-resource-views.cpp
@@ -40,7 +40,8 @@ SlangResult createD3D12BufferDescriptor(
 
     switch (desc.type)
     {
-    default: return SLANG_FAIL;
+    default:
+        return SLANG_FAIL;
 
     case IResourceView::Type::UnorderedAccess:
         {
diff --git a/tools/gfx/d3d12/d3d12-shader-object-layout.cpp b/tools/gfx/d3d12/d3d12-shader-object-layout.cpp
index ad60fb12d..6cf51ee2b 100644
--- a/tools/gfx/d3d12/d3d12-shader-object-layout.cpp
+++ b/tools/gfx/d3d12/d3d12-shader-object-layout.cpp
@@ -198,7 +198,8 @@ Result ShaderObjectLayoutImpl::Builder::setElementTypeLayout(
                 break;
 
             case slang::BindingType::VaryingInput:
-            case slang::BindingType::VaryingOutput: break;
+            case slang::BindingType::VaryingOutput:
+                break;
 
             default:
                 bindingRangeInfo.baseIndex = m_ownCounts.resource;
@@ -491,7 +492,8 @@ Result RootShaderObjectLayoutImpl::RootSignatureDescBuilder::translateDescriptor
     case slang::BindingType::Sampler:
         *outType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
         return SLANG_OK;
-    default: return SLANG_FAIL;
+    default:
+        return SLANG_FAIL;
     }
 }
 
@@ -748,9 +750,11 @@ void RootShaderObjectLayoutImpl::RootSignatureDescBuilder::addAsValue(
         {
         case slang::BindingType::ConstantBuffer:
         case slang::BindingType::ParameterBlock:
-        case slang::BindingType::ExistentialValue: continue;
+        case slang::BindingType::ExistentialValue:
+            continue;
 
-        default: break;
+        default:
+            break;
         }
 
         // For binding ranges that don't represent sub-objects, we will add
diff --git a/tools/gfx/d3d12/d3d12-shader-object.cpp b/tools/gfx/d3d12/d3d12-shader-object.cpp
index 77d3553ba..cd4055804 100644
--- a/tools/gfx/d3d12/d3d12-shader-object.cpp
+++ b/tools/gfx/d3d12/d3d12-shader-object.cpp
@@ -850,7 +850,8 @@ Result ShaderObjectImpl::bindRootArguments(BindingContext* context, uint32_t& in
         case IResourceView::Type::UnorderedAccess:
             context->submitter->setRootUAV(index, m_rootArguments[i]);
             break;
-        default: continue;
+        default:
+            continue;
         }
         index++;
     }