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>

5 files changed, 124 insertions, 60 deletions

diff --git a/tools/gfx/d3d11/d3d11-device.cpp b/tools/gfx/d3d11/d3d11-device.cpp
index 8fe3bf589..ab4670a17 100644
--- a/tools/gfx/d3d11/d3d11-device.cpp
+++ b/tools/gfx/d3d11/d3d11-device.cpp
@@ -660,7 +660,8 @@ Result DeviceImpl::createTextureResource(
             texture->m_resource = texture3D;
             break;
         }
-    default: return SLANG_FAIL;
+    default:
+        return SLANG_FAIL;
     }
 
     returnComPtr(outResource, texture);
@@ -722,7 +723,8 @@ Result DeviceImpl::createBufferResource(
             bufferDesc.Usage = D3D11_USAGE_DYNAMIC;
             break;
         }
-    default: break;
+    default:
+        break;
     }
 
     if (bufferDesc.BindFlags & (D3D11_BIND_UNORDERED_ACCESS | D3D11_BIND_SHADER_RESOURCE))
@@ -818,7 +820,8 @@ Result DeviceImpl::createTextureView(
 
     switch (desc.type)
     {
-    default: return SLANG_FAIL;
+    default:
+        return SLANG_FAIL;
 
     case IResourceView::Type::RenderTarget:
         {
@@ -920,7 +923,8 @@ Result DeviceImpl::createBufferView(
 
     switch (desc.type)
     {
-    default: return SLANG_FAIL;
+    default:
+        return SLANG_FAIL;
 
     case IResourceView::Type::UnorderedAccess:
         {
@@ -1056,11 +1060,20 @@ Result DeviceImpl::createInputLayout(IInputLayout::Desc const& desc, IInputLayou
         switch (inputElementsIn[ii].format)
         {
         case Format::R32G32B32A32_FLOAT:
-        case Format::R8G8B8A8_UNORM:     typeName = "float4"; break;
-        case Format::R32G32B32_FLOAT:    typeName = "float3"; break;
-        case Format::R32G32_FLOAT:       typeName = "float2"; break;
-        case Format::R32_FLOAT:          typeName = "float"; break;
-        default:                         return SLANG_FAIL;
+        case Format::R8G8B8A8_UNORM:
+            typeName = "float4";
+            break;
+        case Format::R32G32B32_FLOAT:
+            typeName = "float3";
+            break;
+        case Format::R32G32_FLOAT:
+            typeName = "float2";
+            break;
+        case Format::R32_FLOAT:
+            typeName = "float";
+            break;
+        default:
+            return SLANG_FAIL;
         }
 
         hlslCursor += sprintf(
@@ -1117,10 +1130,17 @@ void* DeviceImpl::map(IBufferResource* bufferIn, MapFlavor flavor)
 
     switch (flavor)
     {
-    case MapFlavor::WriteDiscard: mapType = D3D11_MAP_WRITE_DISCARD; break;
-    case MapFlavor::HostWrite:    mapType = D3D11_MAP_WRITE_NO_OVERWRITE; break;
-    case MapFlavor::HostRead:     mapType = D3D11_MAP_READ; break;
-    default:                      return nullptr;
+    case MapFlavor::WriteDiscard:
+        mapType = D3D11_MAP_WRITE_DISCARD;
+        break;
+    case MapFlavor::HostWrite:
+        mapType = D3D11_MAP_WRITE_NO_OVERWRITE;
+        break;
+    case MapFlavor::HostRead:
+        mapType = D3D11_MAP_READ;
+        break;
+    default:
+        return nullptr;
     }
 
     bufferResource->m_mapFlavor = flavor;
@@ -1292,7 +1312,8 @@ void DeviceImpl::setPipelineState(IPipelineState* state)
 
     switch (pipelineType)
     {
-    default: break;
+    default:
+        break;
 
     case PipelineType::Graphics:
         {
@@ -1482,7 +1503,8 @@ Result DeviceImpl::createProgram(
                 nullptr,
                 shaderProgram->m_pixelShader.writeRef()));
             break;
-        default: SLANG_ASSERT(!"pipeline stage not implemented");
+        default:
+            SLANG_ASSERT(!"pipeline stage not implemented");
         }
     }
     returnComPtr(outProgram, shaderProgram);
diff --git a/tools/gfx/d3d11/d3d11-helper-functions.cpp b/tools/gfx/d3d11/d3d11-helper-functions.cpp
index 76b339880..e955e75a0 100644
--- a/tools/gfx/d3d11/d3d11-helper-functions.cpp
+++ b/tools/gfx/d3d11/d3d11-helper-functions.cpp
@@ -28,18 +28,27 @@ D3D11_BIND_FLAG calcResourceFlag(ResourceState state)
 {
     switch (state)
     {
-    case ResourceState::VertexBuffer:           return D3D11_BIND_VERTEX_BUFFER;
-    case ResourceState::IndexBuffer:            return D3D11_BIND_INDEX_BUFFER;
-    case ResourceState::ConstantBuffer:         return D3D11_BIND_CONSTANT_BUFFER;
-    case ResourceState::StreamOutput:           return D3D11_BIND_STREAM_OUTPUT;
-    case ResourceState::RenderTarget:           return D3D11_BIND_RENDER_TARGET;
+    case ResourceState::VertexBuffer:
+        return D3D11_BIND_VERTEX_BUFFER;
+    case ResourceState::IndexBuffer:
+        return D3D11_BIND_INDEX_BUFFER;
+    case ResourceState::ConstantBuffer:
+        return D3D11_BIND_CONSTANT_BUFFER;
+    case ResourceState::StreamOutput:
+        return D3D11_BIND_STREAM_OUTPUT;
+    case ResourceState::RenderTarget:
+        return D3D11_BIND_RENDER_TARGET;
     case ResourceState::DepthRead:
-    case ResourceState::DepthWrite:             return D3D11_BIND_DEPTH_STENCIL;
-    case ResourceState::UnorderedAccess:        return D3D11_BIND_UNORDERED_ACCESS;
+    case ResourceState::DepthWrite:
+        return D3D11_BIND_DEPTH_STENCIL;
+    case ResourceState::UnorderedAccess:
+        return D3D11_BIND_UNORDERED_ACCESS;
     case ResourceState::ShaderResource:
     case ResourceState::PixelShaderResource:
-    case ResourceState::NonPixelShaderResource: return D3D11_BIND_SHADER_RESOURCE;
-    default:                                    return D3D11_BIND_FLAG(0);
+    case ResourceState::NonPixelShaderResource:
+        return D3D11_BIND_SHADER_RESOURCE;
+    default:
+        return D3D11_BIND_FLAG(0);
     }
 }
 
@@ -59,10 +68,15 @@ int _calcResourceAccessFlags(MemoryType memType)
 {
     switch (memType)
     {
-    case MemoryType::DeviceLocal: return 0;
-    case MemoryType::ReadBack:    return D3D11_CPU_ACCESS_READ;
-    case MemoryType::Upload:      return D3D11_CPU_ACCESS_WRITE;
-    default:                      assert(!"Invalid flags"); return 0;
+    case MemoryType::DeviceLocal:
+        return 0;
+    case MemoryType::ReadBack:
+        return D3D11_CPU_ACCESS_READ;
+    case MemoryType::Upload:
+        return D3D11_CPU_ACCESS_WRITE;
+    default:
+        assert(!"Invalid flags");
+        return 0;
     }
 }
 
@@ -70,10 +84,12 @@ D3D11_FILTER_TYPE translateFilterMode(TextureFilteringMode mode)
 {
     switch (mode)
     {
-    default: return D3D11_FILTER_TYPE(0);
+    default:
+        return D3D11_FILTER_TYPE(0);
 
-#define CASE(SRC, DST) \
-    case TextureFilteringMode::SRC: return D3D11_FILTER_TYPE_##DST
+#define CASE(SRC, DST)              \
+    case TextureFilteringMode::SRC: \
+        return D3D11_FILTER_TYPE_##DST
 
         CASE(Point, POINT);
         CASE(Linear, LINEAR);
@@ -86,10 +102,12 @@ D3D11_FILTER_REDUCTION_TYPE translateFilterReduction(TextureReductionOp op)
 {
     switch (op)
     {
-    default: return D3D11_FILTER_REDUCTION_TYPE(0);
+    default:
+        return D3D11_FILTER_REDUCTION_TYPE(0);
 
-#define CASE(SRC, DST) \
-    case TextureReductionOp::SRC: return D3D11_FILTER_REDUCTION_TYPE_##DST
+#define CASE(SRC, DST)            \
+    case TextureReductionOp::SRC: \
+        return D3D11_FILTER_REDUCTION_TYPE_##DST
 
         CASE(Average, STANDARD);
         CASE(Comparison, COMPARISON);
@@ -104,10 +122,12 @@ D3D11_TEXTURE_ADDRESS_MODE translateAddressingMode(TextureAddressingMode mode)
 {
     switch (mode)
     {
-    default: return D3D11_TEXTURE_ADDRESS_MODE(0);
+    default:
+        return D3D11_TEXTURE_ADDRESS_MODE(0);
 
-#define CASE(SRC, DST) \
-    case TextureAddressingMode::SRC: return D3D11_TEXTURE_ADDRESS_##DST
+#define CASE(SRC, DST)               \
+    case TextureAddressingMode::SRC: \
+        return D3D11_TEXTURE_ADDRESS_##DST
 
         CASE(Wrap, WRAP);
         CASE(ClampToEdge, CLAMP);
@@ -127,8 +147,9 @@ D3D11_COMPARISON_FUNC translateComparisonFunc(ComparisonFunc func)
         // TODO: need to report failures
         return D3D11_COMPARISON_ALWAYS;
 
-#define CASE(FROM, TO) \
-    case ComparisonFunc::FROM: return D3D11_COMPARISON_##TO
+#define CASE(FROM, TO)         \
+    case ComparisonFunc::FROM: \
+        return D3D11_COMPARISON_##TO
 
         CASE(Never, NEVER);
         CASE(Less, LESS);
@@ -150,8 +171,9 @@ D3D11_STENCIL_OP translateStencilOp(StencilOp op)
         // TODO: need to report failures
         return D3D11_STENCIL_OP_KEEP;
 
-#define CASE(FROM, TO) \
-    case StencilOp::FROM: return D3D11_STENCIL_OP_##TO
+#define CASE(FROM, TO)    \
+    case StencilOp::FROM: \
+        return D3D11_STENCIL_OP_##TO
 
         CASE(Keep, KEEP);
         CASE(Zero, ZERO);
@@ -173,8 +195,10 @@ D3D11_FILL_MODE translateFillMode(FillMode mode)
         // TODO: need to report failures
         return D3D11_FILL_SOLID;
 
-    case FillMode::Solid:     return D3D11_FILL_SOLID;
-    case FillMode::Wireframe: return D3D11_FILL_WIREFRAME;
+    case FillMode::Solid:
+        return D3D11_FILL_SOLID;
+    case FillMode::Wireframe:
+        return D3D11_FILL_WIREFRAME;
     }
 }
 
@@ -186,9 +210,12 @@ D3D11_CULL_MODE translateCullMode(CullMode mode)
         // TODO: need to report failures
         return D3D11_CULL_NONE;
 
-    case CullMode::None:  return D3D11_CULL_NONE;
-    case CullMode::Back:  return D3D11_CULL_BACK;
-    case CullMode::Front: return D3D11_CULL_FRONT;
+    case CullMode::None:
+        return D3D11_CULL_NONE;
+    case CullMode::Back:
+        return D3D11_CULL_BACK;
+    case CullMode::Front:
+        return D3D11_CULL_FRONT;
     }
 }
 
@@ -208,10 +235,13 @@ D3D11_BLEND_OP translateBlendOp(BlendOp op)
 {
     switch (op)
     {
-    default: assert(!"unimplemented"); return (D3D11_BLEND_OP)-1;
+    default:
+        assert(!"unimplemented");
+        return (D3D11_BLEND_OP)-1;
 
-#define CASE(FROM, TO) \
-    case BlendOp::FROM: return D3D11_BLEND_OP_##TO
+#define CASE(FROM, TO)  \
+    case BlendOp::FROM: \
+        return D3D11_BLEND_OP_##TO
         CASE(Add, ADD);
         CASE(Subtract, SUBTRACT);
         CASE(ReverseSubtract, REV_SUBTRACT);
@@ -225,10 +255,13 @@ D3D11_BLEND translateBlendFactor(BlendFactor factor)
 {
     switch (factor)
     {
-    default: assert(!"unimplemented"); return (D3D11_BLEND)-1;
+    default:
+        assert(!"unimplemented");
+        return (D3D11_BLEND)-1;
 
-#define CASE(FROM, TO) \
-    case BlendFactor::FROM: return D3D11_BLEND_##TO
+#define CASE(FROM, TO)      \
+    case BlendFactor::FROM: \
+        return D3D11_BLEND_##TO
         CASE(Zero, ZERO);
         CASE(One, ONE);
         CASE(SrcColor, SRC_COLOR);
@@ -293,7 +326,8 @@ void initSrvDesc(
         case IResource::Type::Texture3D:
             descOut.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
             break;
-        default: assert(!"Unknown dimension");
+        default:
+            assert(!"Unknown dimension");
         }
 
         descOut.Texture2D.MipLevels = textureDesc.numMipLevels;
@@ -334,7 +368,8 @@ void initSrvDesc(
             descOut.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
             break;
 
-        default: assert(!"Unknown dimension");
+        default:
+            assert(!"Unknown dimension");
         }
 
         descOut.Texture2DArray.ArraySize = std::max(textureDesc.size.depth, arraySize);
diff --git a/tools/gfx/d3d11/d3d11-query.cpp b/tools/gfx/d3d11/d3d11-query.cpp
index 1a1c27466..8c55d727e 100644
--- a/tools/gfx/d3d11/d3d11-query.cpp
+++ b/tools/gfx/d3d11/d3d11-query.cpp
@@ -17,8 +17,11 @@ Result QueryPoolImpl::init(const IQueryPool::Desc& desc, DeviceImpl* device)
     m_queryDesc.MiscFlags = 0;
     switch (desc.type)
     {
-    case QueryType::Timestamp: m_queryDesc.Query = D3D11_QUERY_TIMESTAMP; break;
-    default:                   return SLANG_E_INVALID_ARG;
+    case QueryType::Timestamp:
+        m_queryDesc.Query = D3D11_QUERY_TIMESTAMP;
+        break;
+    default:
+        return SLANG_E_INVALID_ARG;
     }
     m_queries.setCount(desc.count);
     return SLANG_OK;
diff --git a/tools/gfx/d3d11/d3d11-shader-object-layout.cpp b/tools/gfx/d3d11/d3d11-shader-object-layout.cpp
index b2b851760..4cb156f2d 100644
--- a/tools/gfx/d3d11/d3d11-shader-object-layout.cpp
+++ b/tools/gfx/d3d11/d3d11-shader-object-layout.cpp
@@ -90,7 +90,8 @@ Result ShaderObjectLayoutImpl::Builder::setElementTypeLayout(
             m_samplerRanges.add(r);
             break;
 
-        case slang::BindingType::CombinedTextureSampler: break;
+        case slang::BindingType::CombinedTextureSampler:
+            break;
         case slang::BindingType::MutableTexture:
         case slang::BindingType::MutableTypedBuffer:
             bindingRangeInfo.baseIndex = m_uavCount;
@@ -98,9 +99,11 @@ Result ShaderObjectLayoutImpl::Builder::setElementTypeLayout(
             m_uavRanges.add(r);
             break;
 
-        case slang::BindingType::VaryingInput: break;
+        case slang::BindingType::VaryingInput:
+            break;
 
-        case slang::BindingType::VaryingOutput: break;
+        case slang::BindingType::VaryingOutput:
+            break;
 
         default:
             bindingRangeInfo.baseIndex = m_srvCount;
diff --git a/tools/gfx/d3d11/d3d11-shader-object.cpp b/tools/gfx/d3d11/d3d11-shader-object.cpp
index 697d463fb..cb882b701 100644
--- a/tools/gfx/d3d11/d3d11-shader-object.cpp
+++ b/tools/gfx/d3d11/d3d11-shader-object.cpp
@@ -478,7 +478,8 @@ Result ShaderObjectImpl::bindAsValue(
             }
             break;
 
-        default: break;
+        default:
+            break;
         }
     }