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>

10 files changed, 693 insertions, 346 deletions

diff --git a/tools/gfx/vulkan/vk-api.cpp b/tools/gfx/vulkan/vk-api.cpp
index 3d2042a8d..80b1d5814 100644
--- a/tools/gfx/vulkan/vk-api.cpp
+++ b/tools/gfx/vulkan/vk-api.cpp
@@ -16,9 +16,12 @@ bool VulkanApi::areDefined(ProcType type) const
 {
     switch (type)
     {
-    case ProcType::Global:   return VK_API_CHECK_FUNCTIONS(VK_API_ALL_GLOBAL_PROCS);
-    case ProcType::Instance: return VK_API_CHECK_FUNCTIONS(VK_API_ALL_INSTANCE_PROCS);
-    case ProcType::Device:   return VK_API_CHECK_FUNCTIONS(VK_API_DEVICE_PROCS);
+    case ProcType::Global:
+        return VK_API_CHECK_FUNCTIONS(VK_API_ALL_GLOBAL_PROCS);
+    case ProcType::Instance:
+        return VK_API_CHECK_FUNCTIONS(VK_API_ALL_INSTANCE_PROCS);
+    case ProcType::Device:
+        return VK_API_CHECK_FUNCTIONS(VK_API_DEVICE_PROCS);
     default:
         {
             assert(!"Unhandled type");
diff --git a/tools/gfx/vulkan/vk-command-encoder.cpp b/tools/gfx/vulkan/vk-command-encoder.cpp
index f9caff437..42af3bee9 100644
--- a/tools/gfx/vulkan/vk-command-encoder.cpp
+++ b/tools/gfx/vulkan/vk-command-encoder.cpp
@@ -25,10 +25,15 @@ int PipelineCommandEncoder::getBindPointIndex(VkPipelineBindPoint bindPoint)
 {
     switch (bindPoint)
     {
-    case VK_PIPELINE_BIND_POINT_GRAPHICS:        return 0;
-    case VK_PIPELINE_BIND_POINT_COMPUTE:         return 1;
-    case VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR: return 2;
-    default:                                     assert(!"unknown pipeline type."); return -1;
+    case VK_PIPELINE_BIND_POINT_GRAPHICS:
+        return 0;
+    case VK_PIPELINE_BIND_POINT_COMPUTE:
+        return 1;
+    case VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR:
+        return 2;
+    default:
+        assert(!"unknown pipeline type.");
+        return -1;
     }
 }
 
@@ -1063,7 +1068,8 @@ void RenderCommandEncoder::setPrimitiveTopology(PrimitiveTopology topology)
     {
         switch (topology)
         {
-        case PrimitiveTopology::TriangleList: break;
+        case PrimitiveTopology::TriangleList:
+            break;
         default:
             // We are using a non-list topology, but we don't have dynmaic state
             // extension, error out.
@@ -1107,9 +1113,14 @@ void RenderCommandEncoder::setIndexBuffer(
     VkIndexType indexType = VK_INDEX_TYPE_UINT16;
     switch (indexFormat)
     {
-    case Format::R16_UINT: indexType = VK_INDEX_TYPE_UINT16; break;
-    case Format::R32_UINT: indexType = VK_INDEX_TYPE_UINT32; break;
-    default:               assert(!"unsupported index format");
+    case Format::R16_UINT:
+        indexType = VK_INDEX_TYPE_UINT16;
+        break;
+    case Format::R32_UINT:
+        indexType = VK_INDEX_TYPE_UINT32;
+        break;
+    default:
+        assert(!"unsupported index format");
     }
 
     BufferResourceImpl* bufferImpl = static_cast<BufferResourceImpl*>(buffer);
@@ -1367,7 +1378,8 @@ void RayTracingCommandEncoder::_queryAccelerationStructureProperties(
         case QueryType::AccelerationStructureSerializedSize:
             queryType = VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR;
             break;
-        case QueryType::AccelerationStructureCurrentSize: continue;
+        case QueryType::AccelerationStructureCurrentSize:
+            continue;
         default:
             getDebugCallback()->handleMessage(
                 DebugMessageType::Error,
diff --git a/tools/gfx/vulkan/vk-device.cpp b/tools/gfx/vulkan/vk-device.cpp
index 68b8ba1db..689213437 100644
--- a/tools/gfx/vulkan/vk-device.cpp
+++ b/tools/gfx/vulkan/vk-device.cpp
@@ -1429,7 +1429,8 @@ uint32_t DeviceImpl::getQueueFamilyIndex(ICommandQueue::QueueType queueType)
     switch (queueType)
     {
     case ICommandQueue::QueueType::Graphics:
-    default:                                 return m_queueFamilyIndex;
+    default:
+        return m_queueFamilyIndex;
     }
 }
 
@@ -2154,11 +2155,15 @@ Result DeviceImpl::createTextureView(
     case IResource::Type::Texture2D:
         createInfo.viewType = isArray ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D;
         break;
-    case IResource::Type::Texture3D: createInfo.viewType = VK_IMAGE_VIEW_TYPE_3D; break;
+    case IResource::Type::Texture3D:
+        createInfo.viewType = VK_IMAGE_VIEW_TYPE_3D;
+        break;
     case IResource::Type::TextureCube:
         createInfo.viewType = isArray ? VK_IMAGE_VIEW_TYPE_CUBE_ARRAY : VK_IMAGE_VIEW_TYPE_CUBE;
         break;
-    default: SLANG_UNIMPLEMENTED_X("Unknown Texture type."); break;
+    default:
+        SLANG_UNIMPLEMENTED_X("Unknown Texture type.");
+        break;
     }
 
     createInfo.subresourceRange.aspectMask = getAspectMaskFromFormat(resourceImpl->m_vkformat);
@@ -2190,8 +2195,12 @@ Result DeviceImpl::createTextureView(
     case IResourceView::Type::ShaderResource:
         view->m_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
         break;
-    case IResourceView::Type::UnorderedAccess: view->m_layout = VK_IMAGE_LAYOUT_GENERAL; break;
-    default:                                   SLANG_UNIMPLEMENTED_X("Unknown TextureViewDesc type."); break;
+    case IResourceView::Type::UnorderedAccess:
+        view->m_layout = VK_IMAGE_LAYOUT_GENERAL;
+        break;
+    default:
+        SLANG_UNIMPLEMENTED_X("Unknown TextureViewDesc type.");
+        break;
     }
     m_api.vkCreateImageView(m_device, &createInfo, nullptr, &view->m_view);
     returnComPtr(outView, view);
@@ -2246,8 +2255,11 @@ Result DeviceImpl::getFormatSupportedResourceStates(Format format, ResourceState
     switch (format)
     {
     case Format::R32_UINT:
-    case Format::R16_UINT: allowedStates.add(ResourceState::IndexBuffer); break;
-    default:               break;
+    case Format::R16_UINT:
+        allowedStates.add(ResourceState::IndexBuffer);
+        break;
+    default:
+        break;
     }
     // ConstantBuffer
     allowedStates.add(ResourceState::ConstantBuffer);
@@ -2335,7 +2347,9 @@ Result DeviceImpl::createBufferView(
 
     switch (desc.type)
     {
-    default: assert(!"unhandled"); return SLANG_FAIL;
+    default:
+        assert(!"unhandled");
+        return SLANG_FAIL;
 
     case IResourceView::Type::UnorderedAccess:
     case IResourceView::Type::ShaderResource:
diff --git a/tools/gfx/vulkan/vk-helper-functions.cpp b/tools/gfx/vulkan/vk-helper-functions.cpp
index b7bbeec2b..f1f517567 100644
--- a/tools/gfx/vulkan/vk-helper-functions.cpp
+++ b/tools/gfx/vulkan/vk-helper-functions.cpp
@@ -31,9 +31,12 @@ VkAttachmentLoadOp translateLoadOp(IRenderPassLayout::TargetLoadOp loadOp)
 {
     switch (loadOp)
     {
-    case IRenderPassLayout::TargetLoadOp::Clear: return VK_ATTACHMENT_LOAD_OP_CLEAR;
-    case IRenderPassLayout::TargetLoadOp::Load:  return VK_ATTACHMENT_LOAD_OP_LOAD;
-    default:                                     return VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+    case IRenderPassLayout::TargetLoadOp::Clear:
+        return VK_ATTACHMENT_LOAD_OP_CLEAR;
+    case IRenderPassLayout::TargetLoadOp::Load:
+        return VK_ATTACHMENT_LOAD_OP_LOAD;
+    default:
+        return VK_ATTACHMENT_LOAD_OP_DONT_CARE;
     }
 }
 
@@ -41,8 +44,10 @@ VkAttachmentStoreOp translateStoreOp(IRenderPassLayout::TargetStoreOp storeOp)
 {
     switch (storeOp)
     {
-    case IRenderPassLayout::TargetStoreOp::Store: return VK_ATTACHMENT_STORE_OP_STORE;
-    default:                                      return VK_ATTACHMENT_STORE_OP_DONT_CARE;
+    case IRenderPassLayout::TargetStoreOp::Store:
+        return VK_ATTACHMENT_STORE_OP_STORE;
+    default:
+        return VK_ATTACHMENT_STORE_OP_DONT_CARE;
     }
 }
 
@@ -66,21 +71,33 @@ VkImageLayout translateImageLayout(ResourceState state)
 {
     switch (state)
     {
-    case ResourceState::Undefined:              return VK_IMAGE_LAYOUT_UNDEFINED;
-    case ResourceState::PreInitialized:         return VK_IMAGE_LAYOUT_PREINITIALIZED;
-    case ResourceState::UnorderedAccess:        return VK_IMAGE_LAYOUT_GENERAL;
-    case ResourceState::RenderTarget:           return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-    case ResourceState::DepthRead:              return VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
-    case ResourceState::DepthWrite:             return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+    case ResourceState::Undefined:
+        return VK_IMAGE_LAYOUT_UNDEFINED;
+    case ResourceState::PreInitialized:
+        return VK_IMAGE_LAYOUT_PREINITIALIZED;
+    case ResourceState::UnorderedAccess:
+        return VK_IMAGE_LAYOUT_GENERAL;
+    case ResourceState::RenderTarget:
+        return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+    case ResourceState::DepthRead:
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+    case ResourceState::DepthWrite:
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
     case ResourceState::ShaderResource:
     case ResourceState::NonPixelShaderResource:
-    case ResourceState::PixelShaderResource:    return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    case ResourceState::PixelShaderResource:
+        return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
     case ResourceState::ResolveDestination:
-    case ResourceState::CopyDestination:        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+    case ResourceState::CopyDestination:
+        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
     case ResourceState::ResolveSource:
-    case ResourceState::CopySource:             return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    case ResourceState::Present:                return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-    default:                                    assert(!"Unsupported"); return VK_IMAGE_LAYOUT_UNDEFINED;
+    case ResourceState::CopySource:
+        return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+    case ResourceState::Present:
+        return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+    default:
+        assert(!"Unsupported");
+        return VK_IMAGE_LAYOUT_UNDEFINED;
     }
 }
 
@@ -90,28 +107,37 @@ VkAccessFlagBits calcAccessFlags(ResourceState state)
     {
     case ResourceState::Undefined:
     case ResourceState::Present:
-    case ResourceState::PreInitialized: return VkAccessFlagBits(0);
-    case ResourceState::VertexBuffer:   return VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
-    case ResourceState::ConstantBuffer: return VK_ACCESS_UNIFORM_READ_BIT;
-    case ResourceState::IndexBuffer:    return VK_ACCESS_INDEX_READ_BIT;
+    case ResourceState::PreInitialized:
+        return VkAccessFlagBits(0);
+    case ResourceState::VertexBuffer:
+        return VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
+    case ResourceState::ConstantBuffer:
+        return VK_ACCESS_UNIFORM_READ_BIT;
+    case ResourceState::IndexBuffer:
+        return VK_ACCESS_INDEX_READ_BIT;
     case ResourceState::RenderTarget:
         return VkAccessFlagBits(
             VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT);
     case ResourceState::ShaderResource:
     case ResourceState::NonPixelShaderResource:
-    case ResourceState::PixelShaderResource:    return VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
+    case ResourceState::PixelShaderResource:
+        return VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
     case ResourceState::UnorderedAccess:
         return VkAccessFlagBits(VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT);
-    case ResourceState::DepthRead: return VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
+    case ResourceState::DepthRead:
+        return VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
     case ResourceState::DepthWrite:
         return VkAccessFlagBits(
             VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT |
             VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
-    case ResourceState::IndirectArgument:   return VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
+    case ResourceState::IndirectArgument:
+        return VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
     case ResourceState::ResolveDestination:
-    case ResourceState::CopyDestination:    return VK_ACCESS_TRANSFER_WRITE_BIT;
+    case ResourceState::CopyDestination:
+        return VK_ACCESS_TRANSFER_WRITE_BIT;
     case ResourceState::ResolveSource:
-    case ResourceState::CopySource:         return VK_ACCESS_TRANSFER_READ_BIT;
+    case ResourceState::CopySource:
+        return VK_ACCESS_TRANSFER_READ_BIT;
     case ResourceState::AccelerationStructure:
         return VkAccessFlagBits(
             VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR |
@@ -120,7 +146,9 @@ VkAccessFlagBits calcAccessFlags(ResourceState state)
         return VkAccessFlagBits(VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR);
     case ResourceState::General:
         return VkAccessFlagBits(VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT);
-    default: assert(!"Unsupported"); return VkAccessFlagBits(0);
+    default:
+        assert(!"Unsupported");
+        return VkAccessFlagBits(0);
     }
 }
 
@@ -129,9 +157,12 @@ VkPipelineStageFlagBits calcPipelineStageFlags(ResourceState state, bool src)
     switch (state)
     {
     case ResourceState::Undefined:
-    case ResourceState::PreInitialized: assert(src); return VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+    case ResourceState::PreInitialized:
+        assert(src);
+        return VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
     case ResourceState::VertexBuffer:
-    case ResourceState::IndexBuffer:    return VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
+    case ResourceState::IndexBuffer:
+        return VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
     case ResourceState::ConstantBuffer:
     case ResourceState::UnorderedAccess:
         return VkPipelineStageFlagBits(
@@ -142,22 +173,27 @@ VkPipelineStageFlagBits calcPipelineStageFlags(ResourceState state, bool src)
             VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
     case ResourceState::ShaderResource:
     case ResourceState::NonPixelShaderResource:
-    case ResourceState::PixelShaderResource:    return VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
-    case ResourceState::RenderTarget:           return VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+    case ResourceState::PixelShaderResource:
+        return VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+    case ResourceState::RenderTarget:
+        return VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
     case ResourceState::DepthRead:
     case ResourceState::DepthWrite:
         return VkPipelineStageFlagBits(
             VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT);
-    case ResourceState::IndirectArgument:   return VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
+    case ResourceState::IndirectArgument:
+        return VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
     case ResourceState::CopySource:
     case ResourceState::CopyDestination:
     case ResourceState::ResolveSource:
-    case ResourceState::ResolveDestination: return VK_PIPELINE_STAGE_TRANSFER_BIT;
+    case ResourceState::ResolveDestination:
+        return VK_PIPELINE_STAGE_TRANSFER_BIT;
     case ResourceState::Present:
         return src ? VkPipelineStageFlagBits(
                          VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT | VK_PIPELINE_STAGE_ALL_COMMANDS_BIT)
                    : VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
-    case ResourceState::General: return VkPipelineStageFlagBits(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
+    case ResourceState::General:
+        return VkPipelineStageFlagBits(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
     case ResourceState::AccelerationStructure:
         return VkPipelineStageFlagBits(
             VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |
@@ -168,7 +204,9 @@ VkPipelineStageFlagBits calcPipelineStageFlags(ResourceState state, bool src)
             VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR);
     case ResourceState::AccelerationStructureBuildInput:
         return VkPipelineStageFlagBits(VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR);
-    default: assert(!"Unsupported"); return VkPipelineStageFlagBits(0);
+    default:
+        assert(!"Unsupported");
+        return VkPipelineStageFlagBits(0);
     }
 }
 
@@ -187,10 +225,14 @@ VkBufferUsageFlagBits _calcBufferUsageFlags(ResourceState state)
 {
     switch (state)
     {
-    case ResourceState::VertexBuffer:   return VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
-    case ResourceState::IndexBuffer:    return VK_BUFFER_USAGE_INDEX_BUFFER_BIT;
-    case ResourceState::ConstantBuffer: return VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
-    case ResourceState::StreamOutput:   return VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT;
+    case ResourceState::VertexBuffer:
+        return VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
+    case ResourceState::IndexBuffer:
+        return VK_BUFFER_USAGE_INDEX_BUFFER_BIT;
+    case ResourceState::ConstantBuffer:
+        return VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
+    case ResourceState::StreamOutput:
+        return VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT;
     case ResourceState::RenderTarget:
     case ResourceState::DepthRead:
     case ResourceState::DepthWrite:
@@ -206,14 +248,18 @@ VkBufferUsageFlagBits _calcBufferUsageFlags(ResourceState state)
     case ResourceState::PixelShaderResource:
         return (VkBufferUsageFlagBits)(VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT |
                                        VK_BUFFER_USAGE_STORAGE_BUFFER_BIT);
-    case ResourceState::CopySource:      return VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
-    case ResourceState::CopyDestination: return VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+    case ResourceState::CopySource:
+        return VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+    case ResourceState::CopyDestination:
+        return VK_BUFFER_USAGE_TRANSFER_DST_BIT;
     case ResourceState::AccelerationStructure:
         return VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR;
-    case ResourceState::IndirectArgument: return VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT;
+    case ResourceState::IndirectArgument:
+        return VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT;
     case ResourceState::AccelerationStructureBuildInput:
         return VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR;
-    default: return VkBufferUsageFlagBits(0);
+    default:
+        return VkBufferUsageFlagBits(0);
     }
 }
 
@@ -233,20 +279,31 @@ VkImageUsageFlagBits _calcImageUsageFlags(ResourceState state)
 {
     switch (state)
     {
-    case ResourceState::RenderTarget:           return VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
-    case ResourceState::DepthWrite:             return VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
-    case ResourceState::DepthRead:              return VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
+    case ResourceState::RenderTarget:
+        return VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+    case ResourceState::DepthWrite:
+        return VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+    case ResourceState::DepthRead:
+        return VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
     case ResourceState::ShaderResource:
     case ResourceState::NonPixelShaderResource:
-    case ResourceState::PixelShaderResource:    return VK_IMAGE_USAGE_SAMPLED_BIT;
-    case ResourceState::UnorderedAccess:        return VK_IMAGE_USAGE_STORAGE_BIT;
-    case ResourceState::CopySource:             return VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
-    case ResourceState::CopyDestination:        return VK_IMAGE_USAGE_TRANSFER_DST_BIT;
-    case ResourceState::ResolveSource:          return VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
-    case ResourceState::ResolveDestination:     return VK_IMAGE_USAGE_TRANSFER_DST_BIT;
-    case ResourceState::Present:                return VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+    case ResourceState::PixelShaderResource:
+        return VK_IMAGE_USAGE_SAMPLED_BIT;
+    case ResourceState::UnorderedAccess:
+        return VK_IMAGE_USAGE_STORAGE_BIT;
+    case ResourceState::CopySource:
+        return VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+    case ResourceState::CopyDestination:
+        return VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    case ResourceState::ResolveSource:
+        return VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+    case ResourceState::ResolveDestination:
+        return VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    case ResourceState::Present:
+        return VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
     case ResourceState::Undefined:
-    case ResourceState::General:                return (VkImageUsageFlagBits)0;
+    case ResourceState::General:
+        return (VkImageUsageFlagBits)0;
     default:
         {
             assert(!"Unsupported");
@@ -275,7 +332,8 @@ VkImageViewType _calcImageViewType(ITextureResource::Type type, const ITextureRe
             }
             break;
         }
-    default: break;
+    default:
+        break;
     }
 
     return VK_IMAGE_VIEW_TYPE_MAX_ENUM;
@@ -331,9 +389,12 @@ VkAccessFlags calcAccessFlagsFromImageLayout(VkImageLayout layout)
     case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL:
     case VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL:
         return VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
-    case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: return VK_ACCESS_SHADER_READ_BIT;
-    case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:     return VK_ACCESS_TRANSFER_READ_BIT;
-    case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:     return VK_ACCESS_TRANSFER_WRITE_BIT;
+    case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
+        return VK_ACCESS_SHADER_READ_BIT;
+    case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
+        return VK_ACCESS_TRANSFER_READ_BIT;
+    case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
+        return VK_ACCESS_TRANSFER_WRITE_BIT;
     default:
         assert(!"Unsupported VkImageLayout");
         return (VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT);
@@ -347,13 +408,16 @@ VkPipelineStageFlags calcPipelineStageFlagsFromImageLayout(VkImageLayout layout)
     case VK_IMAGE_LAYOUT_UNDEFINED:
     case VK_IMAGE_LAYOUT_PREINITIALIZED:
     case VK_IMAGE_LAYOUT_PRESENT_SRC_KHR:
-    case VK_IMAGE_LAYOUT_GENERAL:         return VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+    case VK_IMAGE_LAYOUT_GENERAL:
+        return VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
     case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
         return VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
     case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
         return (VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
-    case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: return VK_PIPELINE_STAGE_TRANSFER_BIT;
-    case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: return VK_PIPELINE_STAGE_TRANSFER_BIT;
+    case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
+        return VK_PIPELINE_STAGE_TRANSFER_BIT;
+    case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
+        return VK_PIPELINE_STAGE_TRANSFER_BIT;
     case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
     case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL:
     case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL:
@@ -364,7 +428,9 @@ VkPipelineStageFlags calcPipelineStageFlagsFromImageLayout(VkImageLayout layout)
     case VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL:
         return (
             VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT);
-    default: assert(!"Unsupported VkImageLayout"); return VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+    default:
+        assert(!"Unsupported VkImageLayout");
+        return VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
     }
 }
 
@@ -378,9 +444,12 @@ VkImageAspectFlags getAspectMaskFromFormat(VkFormat format)
         return VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
     case VK_FORMAT_D16_UNORM:
     case VK_FORMAT_D32_SFLOAT:
-    case VK_FORMAT_X8_D24_UNORM_PACK32: return VK_IMAGE_ASPECT_DEPTH_BIT;
-    case VK_FORMAT_S8_UINT:             return VK_IMAGE_ASPECT_STENCIL_BIT;
-    default:                            return VK_IMAGE_ASPECT_COLOR_BIT;
+    case VK_FORMAT_X8_D24_UNORM_PACK32:
+        return VK_IMAGE_ASPECT_DEPTH_BIT;
+    case VK_FORMAT_S8_UINT:
+        return VK_IMAGE_ASPECT_STENCIL_BIT;
+    default:
+        return VK_IMAGE_ASPECT_COLOR_BIT;
     }
 }
 
diff --git a/tools/gfx/vulkan/vk-pipeline-state.cpp b/tools/gfx/vulkan/vk-pipeline-state.cpp
index 8fd0c5680..d850b499d 100644
--- a/tools/gfx/vulkan/vk-pipeline-state.cpp
+++ b/tools/gfx/vulkan/vk-pipeline-state.cpp
@@ -343,9 +343,13 @@ Result PipelineStateImpl::ensureAPIPipelineStateCreated()
 
     switch (desc.type)
     {
-    case PipelineType::Compute:  return createVKComputePipelineState();
-    case PipelineType::Graphics: return createVKGraphicsPipelineState();
-    default:                     SLANG_UNREACHABLE("Unknown pipeline type."); return SLANG_FAIL;
+    case PipelineType::Compute:
+        return createVKComputePipelineState();
+    case PipelineType::Graphics:
+        return createVKGraphicsPipelineState();
+    default:
+        SLANG_UNREACHABLE("Unknown pipeline type.");
+        return SLANG_FAIL;
     }
 }
 SLANG_NO_THROW Result SLANG_MCALL PipelineStateImpl::getNativeHandle(InteropHandle* outHandle)
@@ -493,8 +497,11 @@ Result RayTracingPipelineStateImpl::ensureAPIPipelineStateCreated()
 
     switch (desc.type)
     {
-    case PipelineType::RayTracing: return createVKRayTracingPipelineState();
-    default:                       SLANG_UNREACHABLE("Unknown pipeline type."); return SLANG_FAIL;
+    case PipelineType::RayTracing:
+        return createVKRayTracingPipelineState();
+    default:
+        SLANG_UNREACHABLE("Unknown pipeline type.");
+        return SLANG_FAIL;
     }
 }
 Result RayTracingPipelineStateImpl::getNativeHandle(InteropHandle* outHandle)
diff --git a/tools/gfx/vulkan/vk-query.cpp b/tools/gfx/vulkan/vk-query.cpp
index 694896966..910a65b87 100644
--- a/tools/gfx/vulkan/vk-query.cpp
+++ b/tools/gfx/vulkan/vk-query.cpp
@@ -19,7 +19,9 @@ Result QueryPoolImpl::init(const IQueryPool::Desc& desc, DeviceImpl* device)
     createInfo.queryCount = (uint32_t)desc.count;
     switch (desc.type)
     {
-    case QueryType::Timestamp: createInfo.queryType = VK_QUERY_TYPE_TIMESTAMP; break;
+    case QueryType::Timestamp:
+        createInfo.queryType = VK_QUERY_TYPE_TIMESTAMP;
+        break;
     case QueryType::AccelerationStructureCompactedSize:
         createInfo.queryType = VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_KHR;
         break;
@@ -29,7 +31,8 @@ Result QueryPoolImpl::init(const IQueryPool::Desc& desc, DeviceImpl* device)
     case QueryType::AccelerationStructureCurrentSize:
         // Vulkan does not support CurrentSize query, will not create actual pools here.
         return SLANG_OK;
-    default: return SLANG_E_INVALID_ARG;
+    default:
+        return SLANG_E_INVALID_ARG;
     }
     SLANG_VK_RETURN_ON_FAIL(
         m_device->m_api.vkCreateQueryPool(m_device->m_api.m_device, &createInfo, nullptr, &m_pool));
diff --git a/tools/gfx/vulkan/vk-shader-object-layout.cpp b/tools/gfx/vulkan/vk-shader-object-layout.cpp
index 6129246cb..676645449 100644
--- a/tools/gfx/vulkan/vk-shader-object-layout.cpp
+++ b/tools/gfx/vulkan/vk-shader-object-layout.cpp
@@ -31,22 +31,33 @@ VkDescriptorType ShaderObjectLayoutImpl::Builder::_mapDescriptorType(
     switch (slangBindingType)
     {
     case slang::BindingType::PushConstant:
-    default:                               SLANG_ASSERT("unsupported binding type"); return VK_DESCRIPTOR_TYPE_MAX_ENUM;
+    default:
+        SLANG_ASSERT("unsupported binding type");
+        return VK_DESCRIPTOR_TYPE_MAX_ENUM;
 
-    case slang::BindingType::Sampler: return VK_DESCRIPTOR_TYPE_SAMPLER;
+    case slang::BindingType::Sampler:
+        return VK_DESCRIPTOR_TYPE_SAMPLER;
     case slang::BindingType::CombinedTextureSampler:
         return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
-    case slang::BindingType::Texture:            return VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
-    case slang::BindingType::MutableTexture:     return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
-    case slang::BindingType::TypedBuffer:        return VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
-    case slang::BindingType::MutableTypedBuffer: return VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+    case slang::BindingType::Texture:
+        return VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
+    case slang::BindingType::MutableTexture:
+        return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
+    case slang::BindingType::TypedBuffer:
+        return VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
+    case slang::BindingType::MutableTypedBuffer:
+        return VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
     case slang::BindingType::RawBuffer:
-    case slang::BindingType::MutableRawBuffer:   return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
-    case slang::BindingType::InputRenderTarget:  return VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
-    case slang::BindingType::InlineUniformData:  return VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT;
+    case slang::BindingType::MutableRawBuffer:
+        return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+    case slang::BindingType::InputRenderTarget:
+        return VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
+    case slang::BindingType::InlineUniformData:
+        return VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT;
     case slang::BindingType::RayTracingAccelerationStructure:
         return VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
-    case slang::BindingType::ConstantBuffer: return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+    case slang::BindingType::ConstantBuffer:
+        return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
     }
 }
 
@@ -84,7 +95,8 @@ void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
         auto bindingRangeType = typeLayout->getBindingRangeType(bindingRangeIndex);
         switch (bindingRangeType)
         {
-        default: break;
+        default:
+            break;
 
         // We will skip over ranges that represent sub-objects for now, and handle
         // them in a separate pass.
@@ -92,7 +104,8 @@ void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
         case slang::BindingType::ParameterBlock:
         case slang::BindingType::ConstantBuffer:
         case slang::BindingType::ExistentialValue:
-        case slang::BindingType::PushConstant:     continue;
+        case slang::BindingType::PushConstant:
+            continue;
         }
 
         // Given a binding range we are interested in, we will then enumerate
@@ -124,8 +137,10 @@ void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
             {
             case slang::BindingType::ExistentialValue:
             case slang::BindingType::InlineUniformData:
-            case slang::BindingType::PushConstant:      continue;
-            default:                                    break;
+            case slang::BindingType::PushConstant:
+                continue;
+            default:
+                break;
             }
 
             auto vkDescriptorType = _mapDescriptorType(slangDescriptorType);
@@ -170,7 +185,8 @@ void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
         // decriptor sets of a parent object.
         //
         case slang::BindingType::ParameterBlock:
-        default:                                 break;
+        default:
+            break;
 
         case slang::BindingType::ExistentialValue:
             // An interest/existential-typed sub-object range will only contribute
@@ -508,7 +524,8 @@ void ShaderObjectLayoutImpl::Builder::addBindingRanges(slang::TypeLayoutReflecti
             }
             break;
 
-        default: break;
+        default:
+            break;
         }
 
         m_subObjectRanges.add(subObjectRange);
diff --git a/tools/gfx/vulkan/vk-shader-object.cpp b/tools/gfx/vulkan/vk-shader-object.cpp
index 862f6137a..eaee69edb 100644
--- a/tools/gfx/vulkan/vk-shader-object.cpp
+++ b/tools/gfx/vulkan/vk-shader-object.cpp
@@ -672,7 +672,8 @@ Result ShaderObjectImpl::bindAsValue(
         {
         case slang::BindingType::ConstantBuffer:
         case slang::BindingType::ParameterBlock:
-        case slang::BindingType::ExistentialValue: break;
+        case slang::BindingType::ExistentialValue:
+            break;
 
         case slang::BindingType::Texture:
             rangeOffset.bindingSet += bindingRangeInfo.setOffset;
@@ -751,7 +752,8 @@ Result ShaderObjectImpl::bindAsValue(
                 m_resourceViews.getArrayView(baseIndex, count));
             break;
         case slang::BindingType::VaryingInput:
-        case slang::BindingType::VaryingOutput: break;
+        case slang::BindingType::VaryingOutput:
+            break;
 
         default:
             SLANG_ASSERT(!"unsupported binding type");
diff --git a/tools/gfx/vulkan/vk-util.cpp b/tools/gfx/vulkan/vk-util.cpp
index 696e80fc7..2490d48ce 100644
--- a/tools/gfx/vulkan/vk-util.cpp
+++ b/tools/gfx/vulkan/vk-util.cpp
@@ -13,111 +13,195 @@ namespace gfx
 {
     switch (format)
     {
-    case Format::R32G32B32A32_TYPELESS: return VK_FORMAT_R32G32B32A32_SFLOAT;
-    case Format::R32G32B32_TYPELESS:    return VK_FORMAT_R32G32B32_SFLOAT;
-    case Format::R32G32_TYPELESS:       return VK_FORMAT_R32G32_SFLOAT;
-    case Format::R32_TYPELESS:          return VK_FORMAT_R32_SFLOAT;
-
-    case Format::R16G16B16A16_TYPELESS: return VK_FORMAT_R16G16B16A16_SFLOAT;
-    case Format::R16G16_TYPELESS:       return VK_FORMAT_R16G16_SFLOAT;
-    case Format::R16_TYPELESS:          return VK_FORMAT_R16_SFLOAT;
-
-    case Format::R8G8B8A8_TYPELESS: return VK_FORMAT_R8G8B8A8_UNORM;
-    case Format::R8G8_TYPELESS:     return VK_FORMAT_R8G8_UNORM;
-    case Format::R8_TYPELESS:       return VK_FORMAT_R8_UNORM;
-    case Format::B8G8R8A8_TYPELESS: return VK_FORMAT_B8G8R8A8_UNORM;
-
-    case Format::R64_UINT: return VK_FORMAT_R64_UINT;
-
-    case Format::R32G32B32A32_FLOAT: return VK_FORMAT_R32G32B32A32_SFLOAT;
-    case Format::R32G32B32_FLOAT:    return VK_FORMAT_R32G32B32_SFLOAT;
-    case Format::R32G32_FLOAT:       return VK_FORMAT_R32G32_SFLOAT;
-    case Format::R32_FLOAT:          return VK_FORMAT_R32_SFLOAT;
-
-    case Format::R16G16B16A16_FLOAT: return VK_FORMAT_R16G16B16A16_SFLOAT;
-    case Format::R16G16_FLOAT:       return VK_FORMAT_R16G16_SFLOAT;
-    case Format::R16_FLOAT:          return VK_FORMAT_R16_SFLOAT;
-
-    case Format::R32G32B32A32_UINT: return VK_FORMAT_R32G32B32A32_UINT;
-    case Format::R32G32B32_UINT:    return VK_FORMAT_R32G32B32_UINT;
-    case Format::R32G32_UINT:       return VK_FORMAT_R32G32_UINT;
-    case Format::R32_UINT:          return VK_FORMAT_R32_UINT;
-
-    case Format::R16G16B16A16_UINT: return VK_FORMAT_R16G16B16A16_UINT;
-    case Format::R16G16_UINT:       return VK_FORMAT_R16G16_UINT;
-    case Format::R16_UINT:          return VK_FORMAT_R16_UINT;
-
-    case Format::R8G8B8A8_UINT: return VK_FORMAT_R8G8B8A8_UINT;
-    case Format::R8G8_UINT:     return VK_FORMAT_R8G8_UINT;
-    case Format::R8_UINT:       return VK_FORMAT_R8_UINT;
-
-    case Format::R64_SINT: return VK_FORMAT_R64_SINT;
-
-    case Format::R32G32B32A32_SINT: return VK_FORMAT_R32G32B32A32_SINT;
-    case Format::R32G32B32_SINT:    return VK_FORMAT_R32G32B32_SINT;
-    case Format::R32G32_SINT:       return VK_FORMAT_R32G32_SINT;
-    case Format::R32_SINT:          return VK_FORMAT_R32_SINT;
-
-    case Format::R16G16B16A16_SINT: return VK_FORMAT_R16G16B16A16_SINT;
-    case Format::R16G16_SINT:       return VK_FORMAT_R16G16_SINT;
-    case Format::R16_SINT:          return VK_FORMAT_R16_SINT;
-
-    case Format::R8G8B8A8_SINT: return VK_FORMAT_R8G8B8A8_SINT;
-    case Format::R8G8_SINT:     return VK_FORMAT_R8G8_SINT;
-    case Format::R8_SINT:       return VK_FORMAT_R8_SINT;
-
-    case Format::R16G16B16A16_UNORM: return VK_FORMAT_R16G16B16A16_UNORM;
-    case Format::R16G16_UNORM:       return VK_FORMAT_R16G16_UNORM;
-    case Format::R16_UNORM:          return VK_FORMAT_R16_UNORM;
-
-    case Format::R8G8B8A8_UNORM:      return VK_FORMAT_R8G8B8A8_UNORM;
-    case Format::R8G8B8A8_UNORM_SRGB: return VK_FORMAT_R8G8B8A8_SRGB;
-    case Format::R8G8_UNORM:          return VK_FORMAT_R8G8_UNORM;
-    case Format::R8_UNORM:            return VK_FORMAT_R8_UNORM;
-    case Format::B8G8R8A8_UNORM:      return VK_FORMAT_B8G8R8A8_UNORM;
-    case Format::B8G8R8A8_UNORM_SRGB: return VK_FORMAT_B8G8R8A8_SRGB;
-    case Format::B8G8R8X8_UNORM:      return VK_FORMAT_B8G8R8A8_UNORM;
-    case Format::B8G8R8X8_UNORM_SRGB: return VK_FORMAT_B8G8R8A8_SRGB;
-
-    case Format::R16G16B16A16_SNORM: return VK_FORMAT_R16G16B16A16_SNORM;
-    case Format::R16G16_SNORM:       return VK_FORMAT_R16G16_SNORM;
-    case Format::R16_SNORM:          return VK_FORMAT_R16_SNORM;
-
-    case Format::R8G8B8A8_SNORM: return VK_FORMAT_R8G8B8A8_SNORM;
-    case Format::R8G8_SNORM:     return VK_FORMAT_R8G8_SNORM;
-    case Format::R8_SNORM:       return VK_FORMAT_R8_SNORM;
-
-    case Format::D32_FLOAT:              return VK_FORMAT_D32_SFLOAT;
-    case Format::D16_UNORM:              return VK_FORMAT_D16_UNORM;
-    case Format::D32_FLOAT_S8_UINT:      return VK_FORMAT_D32_SFLOAT_S8_UINT;
-    case Format::R32_FLOAT_X32_TYPELESS: return VK_FORMAT_R32_SFLOAT;
-
-    case Format::B4G4R4A4_UNORM: return VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT;
-    case Format::B5G6R5_UNORM:   return VK_FORMAT_R5G6B5_UNORM_PACK16;
-    case Format::B5G5R5A1_UNORM: return VK_FORMAT_A1R5G5B5_UNORM_PACK16;
-
-    case Format::R9G9B9E5_SHAREDEXP:   return VK_FORMAT_E5B9G9R9_UFLOAT_PACK32;
-    case Format::R10G10B10A2_TYPELESS: return VK_FORMAT_A2B10G10R10_UINT_PACK32;
-    case Format::R10G10B10A2_UINT:     return VK_FORMAT_A2B10G10R10_UINT_PACK32;
-    case Format::R10G10B10A2_UNORM:    return VK_FORMAT_A2B10G10R10_UNORM_PACK32;
-    case Format::R11G11B10_FLOAT:      return VK_FORMAT_B10G11R11_UFLOAT_PACK32;
-
-    case Format::BC1_UNORM:      return VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
-    case Format::BC1_UNORM_SRGB: return VK_FORMAT_BC1_RGBA_SRGB_BLOCK;
-    case Format::BC2_UNORM:      return VK_FORMAT_BC2_UNORM_BLOCK;
-    case Format::BC2_UNORM_SRGB: return VK_FORMAT_BC2_SRGB_BLOCK;
-    case Format::BC3_UNORM:      return VK_FORMAT_BC3_UNORM_BLOCK;
-    case Format::BC3_UNORM_SRGB: return VK_FORMAT_BC3_SRGB_BLOCK;
-    case Format::BC4_UNORM:      return VK_FORMAT_BC4_UNORM_BLOCK;
-    case Format::BC4_SNORM:      return VK_FORMAT_BC4_SNORM_BLOCK;
-    case Format::BC5_UNORM:      return VK_FORMAT_BC5_UNORM_BLOCK;
-    case Format::BC5_SNORM:      return VK_FORMAT_BC5_SNORM_BLOCK;
-    case Format::BC6H_UF16:      return VK_FORMAT_BC6H_UFLOAT_BLOCK;
-    case Format::BC6H_SF16:      return VK_FORMAT_BC6H_SFLOAT_BLOCK;
-    case Format::BC7_UNORM:      return VK_FORMAT_BC7_UNORM_BLOCK;
-    case Format::BC7_UNORM_SRGB: return VK_FORMAT_BC7_SRGB_BLOCK;
-
-    default: return VK_FORMAT_UNDEFINED;
+    case Format::R32G32B32A32_TYPELESS:
+        return VK_FORMAT_R32G32B32A32_SFLOAT;
+    case Format::R32G32B32_TYPELESS:
+        return VK_FORMAT_R32G32B32_SFLOAT;
+    case Format::R32G32_TYPELESS:
+        return VK_FORMAT_R32G32_SFLOAT;
+    case Format::R32_TYPELESS:
+        return VK_FORMAT_R32_SFLOAT;
+
+    case Format::R16G16B16A16_TYPELESS:
+        return VK_FORMAT_R16G16B16A16_SFLOAT;
+    case Format::R16G16_TYPELESS:
+        return VK_FORMAT_R16G16_SFLOAT;
+    case Format::R16_TYPELESS:
+        return VK_FORMAT_R16_SFLOAT;
+
+    case Format::R8G8B8A8_TYPELESS:
+        return VK_FORMAT_R8G8B8A8_UNORM;
+    case Format::R8G8_TYPELESS:
+        return VK_FORMAT_R8G8_UNORM;
+    case Format::R8_TYPELESS:
+        return VK_FORMAT_R8_UNORM;
+    case Format::B8G8R8A8_TYPELESS:
+        return VK_FORMAT_B8G8R8A8_UNORM;
+
+    case Format::R64_UINT:
+        return VK_FORMAT_R64_UINT;
+
+    case Format::R32G32B32A32_FLOAT:
+        return VK_FORMAT_R32G32B32A32_SFLOAT;
+    case Format::R32G32B32_FLOAT:
+        return VK_FORMAT_R32G32B32_SFLOAT;
+    case Format::R32G32_FLOAT:
+        return VK_FORMAT_R32G32_SFLOAT;
+    case Format::R32_FLOAT:
+        return VK_FORMAT_R32_SFLOAT;
+
+    case Format::R16G16B16A16_FLOAT:
+        return VK_FORMAT_R16G16B16A16_SFLOAT;
+    case Format::R16G16_FLOAT:
+        return VK_FORMAT_R16G16_SFLOAT;
+    case Format::R16_FLOAT:
+        return VK_FORMAT_R16_SFLOAT;
+
+    case Format::R32G32B32A32_UINT:
+        return VK_FORMAT_R32G32B32A32_UINT;
+    case Format::R32G32B32_UINT:
+        return VK_FORMAT_R32G32B32_UINT;
+    case Format::R32G32_UINT:
+        return VK_FORMAT_R32G32_UINT;
+    case Format::R32_UINT:
+        return VK_FORMAT_R32_UINT;
+
+    case Format::R16G16B16A16_UINT:
+        return VK_FORMAT_R16G16B16A16_UINT;
+    case Format::R16G16_UINT:
+        return VK_FORMAT_R16G16_UINT;
+    case Format::R16_UINT:
+        return VK_FORMAT_R16_UINT;
+
+    case Format::R8G8B8A8_UINT:
+        return VK_FORMAT_R8G8B8A8_UINT;
+    case Format::R8G8_UINT:
+        return VK_FORMAT_R8G8_UINT;
+    case Format::R8_UINT:
+        return VK_FORMAT_R8_UINT;
+
+    case Format::R64_SINT:
+        return VK_FORMAT_R64_SINT;
+
+    case Format::R32G32B32A32_SINT:
+        return VK_FORMAT_R32G32B32A32_SINT;
+    case Format::R32G32B32_SINT:
+        return VK_FORMAT_R32G32B32_SINT;
+    case Format::R32G32_SINT:
+        return VK_FORMAT_R32G32_SINT;
+    case Format::R32_SINT:
+        return VK_FORMAT_R32_SINT;
+
+    case Format::R16G16B16A16_SINT:
+        return VK_FORMAT_R16G16B16A16_SINT;
+    case Format::R16G16_SINT:
+        return VK_FORMAT_R16G16_SINT;
+    case Format::R16_SINT:
+        return VK_FORMAT_R16_SINT;
+
+    case Format::R8G8B8A8_SINT:
+        return VK_FORMAT_R8G8B8A8_SINT;
+    case Format::R8G8_SINT:
+        return VK_FORMAT_R8G8_SINT;
+    case Format::R8_SINT:
+        return VK_FORMAT_R8_SINT;
+
+    case Format::R16G16B16A16_UNORM:
+        return VK_FORMAT_R16G16B16A16_UNORM;
+    case Format::R16G16_UNORM:
+        return VK_FORMAT_R16G16_UNORM;
+    case Format::R16_UNORM:
+        return VK_FORMAT_R16_UNORM;
+
+    case Format::R8G8B8A8_UNORM:
+        return VK_FORMAT_R8G8B8A8_UNORM;
+    case Format::R8G8B8A8_UNORM_SRGB:
+        return VK_FORMAT_R8G8B8A8_SRGB;
+    case Format::R8G8_UNORM:
+        return VK_FORMAT_R8G8_UNORM;
+    case Format::R8_UNORM:
+        return VK_FORMAT_R8_UNORM;
+    case Format::B8G8R8A8_UNORM:
+        return VK_FORMAT_B8G8R8A8_UNORM;
+    case Format::B8G8R8A8_UNORM_SRGB:
+        return VK_FORMAT_B8G8R8A8_SRGB;
+    case Format::B8G8R8X8_UNORM:
+        return VK_FORMAT_B8G8R8A8_UNORM;
+    case Format::B8G8R8X8_UNORM_SRGB:
+        return VK_FORMAT_B8G8R8A8_SRGB;
+
+    case Format::R16G16B16A16_SNORM:
+        return VK_FORMAT_R16G16B16A16_SNORM;
+    case Format::R16G16_SNORM:
+        return VK_FORMAT_R16G16_SNORM;
+    case Format::R16_SNORM:
+        return VK_FORMAT_R16_SNORM;
+
+    case Format::R8G8B8A8_SNORM:
+        return VK_FORMAT_R8G8B8A8_SNORM;
+    case Format::R8G8_SNORM:
+        return VK_FORMAT_R8G8_SNORM;
+    case Format::R8_SNORM:
+        return VK_FORMAT_R8_SNORM;
+
+    case Format::D32_FLOAT:
+        return VK_FORMAT_D32_SFLOAT;
+    case Format::D16_UNORM:
+        return VK_FORMAT_D16_UNORM;
+    case Format::D32_FLOAT_S8_UINT:
+        return VK_FORMAT_D32_SFLOAT_S8_UINT;
+    case Format::R32_FLOAT_X32_TYPELESS:
+        return VK_FORMAT_R32_SFLOAT;
+
+    case Format::B4G4R4A4_UNORM:
+        return VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT;
+    case Format::B5G6R5_UNORM:
+        return VK_FORMAT_R5G6B5_UNORM_PACK16;
+    case Format::B5G5R5A1_UNORM:
+        return VK_FORMAT_A1R5G5B5_UNORM_PACK16;
+
+    case Format::R9G9B9E5_SHAREDEXP:
+        return VK_FORMAT_E5B9G9R9_UFLOAT_PACK32;
+    case Format::R10G10B10A2_TYPELESS:
+        return VK_FORMAT_A2B10G10R10_UINT_PACK32;
+    case Format::R10G10B10A2_UINT:
+        return VK_FORMAT_A2B10G10R10_UINT_PACK32;
+    case Format::R10G10B10A2_UNORM:
+        return VK_FORMAT_A2B10G10R10_UNORM_PACK32;
+    case Format::R11G11B10_FLOAT:
+        return VK_FORMAT_B10G11R11_UFLOAT_PACK32;
+
+    case Format::BC1_UNORM:
+        return VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
+    case Format::BC1_UNORM_SRGB:
+        return VK_FORMAT_BC1_RGBA_SRGB_BLOCK;
+    case Format::BC2_UNORM:
+        return VK_FORMAT_BC2_UNORM_BLOCK;
+    case Format::BC2_UNORM_SRGB:
+        return VK_FORMAT_BC2_SRGB_BLOCK;
+    case Format::BC3_UNORM:
+        return VK_FORMAT_BC3_UNORM_BLOCK;
+    case Format::BC3_UNORM_SRGB:
+        return VK_FORMAT_BC3_SRGB_BLOCK;
+    case Format::BC4_UNORM:
+        return VK_FORMAT_BC4_UNORM_BLOCK;
+    case Format::BC4_SNORM:
+        return VK_FORMAT_BC4_SNORM_BLOCK;
+    case Format::BC5_UNORM:
+        return VK_FORMAT_BC5_UNORM_BLOCK;
+    case Format::BC5_SNORM:
+        return VK_FORMAT_BC5_SNORM_BLOCK;
+    case Format::BC6H_UF16:
+        return VK_FORMAT_BC6H_UFLOAT_BLOCK;
+    case Format::BC6H_SF16:
+        return VK_FORMAT_BC6H_SFLOAT_BLOCK;
+    case Format::BC7_UNORM:
+        return VK_FORMAT_BC7_UNORM_BLOCK;
+    case Format::BC7_UNORM_SRGB:
+        return VK_FORMAT_BC7_SRGB_BLOCK;
+
+    default:
+        return VK_FORMAT_UNDEFINED;
     }
 }
 
@@ -134,22 +218,34 @@ VkImageAspectFlags VulkanUtil::getAspectMask(TextureAspect aspect, VkFormat form
             return VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
         case VK_FORMAT_D16_UNORM:
         case VK_FORMAT_D32_SFLOAT:
-        case VK_FORMAT_X8_D24_UNORM_PACK32: return VK_IMAGE_ASPECT_DEPTH_BIT;
-        case VK_FORMAT_S8_UINT:             return VK_IMAGE_ASPECT_STENCIL_BIT;
-        default:                            return VK_IMAGE_ASPECT_COLOR_BIT;
+        case VK_FORMAT_X8_D24_UNORM_PACK32:
+            return VK_IMAGE_ASPECT_DEPTH_BIT;
+        case VK_FORMAT_S8_UINT:
+            return VK_IMAGE_ASPECT_STENCIL_BIT;
+        default:
+            return VK_IMAGE_ASPECT_COLOR_BIT;
         }
-    case TextureAspect::Color: return VK_IMAGE_ASPECT_COLOR_BIT;
-    case TextureAspect::Depth: return VK_IMAGE_ASPECT_DEPTH_BIT;
+    case TextureAspect::Color:
+        return VK_IMAGE_ASPECT_COLOR_BIT;
+    case TextureAspect::Depth:
+        return VK_IMAGE_ASPECT_DEPTH_BIT;
     case TextureAspect::DepthStencil:
         return VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
-    case TextureAspect::Stencil: return VK_IMAGE_ASPECT_STENCIL_BIT;
-    case TextureAspect::Plane0:  return VK_IMAGE_ASPECT_PLANE_0_BIT;
-    case TextureAspect::Plane1:  return VK_IMAGE_ASPECT_PLANE_1_BIT;
-
-    case TextureAspect::Plane2: return VK_IMAGE_ASPECT_PLANE_2_BIT;
-
-    case TextureAspect::MetaData: return VK_IMAGE_ASPECT_METADATA_BIT;
-    default:                      SLANG_UNREACHABLE("getAspectMask"); return 0;
+    case TextureAspect::Stencil:
+        return VK_IMAGE_ASPECT_STENCIL_BIT;
+    case TextureAspect::Plane0:
+        return VK_IMAGE_ASPECT_PLANE_0_BIT;
+    case TextureAspect::Plane1:
+        return VK_IMAGE_ASPECT_PLANE_1_BIT;
+
+    case TextureAspect::Plane2:
+        return VK_IMAGE_ASPECT_PLANE_2_BIT;
+
+    case TextureAspect::MetaData:
+        return VK_IMAGE_ASPECT_METADATA_BIT;
+    default:
+        SLANG_UNREACHABLE("getAspectMask");
+        return 0;
     }
 }
 
@@ -162,21 +258,37 @@ VkShaderStageFlags VulkanUtil::getShaderStage(SlangStage stage)
 {
     switch (stage)
     {
-    case SLANG_STAGE_ANY_HIT:        return VK_SHADER_STAGE_ANY_HIT_BIT_KHR;
-    case SLANG_STAGE_CALLABLE:       return VK_SHADER_STAGE_CALLABLE_BIT_KHR;
-    case SLANG_STAGE_CLOSEST_HIT:    return VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR;
-    case SLANG_STAGE_COMPUTE:        return VK_SHADER_STAGE_COMPUTE_BIT;
-    case SLANG_STAGE_DOMAIN:         return VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT;
-    case SLANG_STAGE_FRAGMENT:       return VK_SHADER_STAGE_FRAGMENT_BIT;
-    case SLANG_STAGE_GEOMETRY:       return VK_SHADER_STAGE_GEOMETRY_BIT;
-    case SLANG_STAGE_HULL:           return VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT;
-    case SLANG_STAGE_INTERSECTION:   return VK_SHADER_STAGE_INTERSECTION_BIT_KHR;
-    case SLANG_STAGE_MISS:           return VK_SHADER_STAGE_MISS_BIT_KHR;
-    case SLANG_STAGE_RAY_GENERATION: return VK_SHADER_STAGE_RAYGEN_BIT_KHR;
-    case SLANG_STAGE_VERTEX:         return VK_SHADER_STAGE_VERTEX_BIT;
-    case SLANG_STAGE_MESH:           return VK_SHADER_STAGE_MESH_BIT_EXT;
-    case SLANG_STAGE_AMPLIFICATION:  return VK_SHADER_STAGE_TASK_BIT_EXT;
-    default:                         assert(!"unsupported stage."); return VkShaderStageFlags(-1);
+    case SLANG_STAGE_ANY_HIT:
+        return VK_SHADER_STAGE_ANY_HIT_BIT_KHR;
+    case SLANG_STAGE_CALLABLE:
+        return VK_SHADER_STAGE_CALLABLE_BIT_KHR;
+    case SLANG_STAGE_CLOSEST_HIT:
+        return VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR;
+    case SLANG_STAGE_COMPUTE:
+        return VK_SHADER_STAGE_COMPUTE_BIT;
+    case SLANG_STAGE_DOMAIN:
+        return VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT;
+    case SLANG_STAGE_FRAGMENT:
+        return VK_SHADER_STAGE_FRAGMENT_BIT;
+    case SLANG_STAGE_GEOMETRY:
+        return VK_SHADER_STAGE_GEOMETRY_BIT;
+    case SLANG_STAGE_HULL:
+        return VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT;
+    case SLANG_STAGE_INTERSECTION:
+        return VK_SHADER_STAGE_INTERSECTION_BIT_KHR;
+    case SLANG_STAGE_MISS:
+        return VK_SHADER_STAGE_MISS_BIT_KHR;
+    case SLANG_STAGE_RAY_GENERATION:
+        return VK_SHADER_STAGE_RAYGEN_BIT_KHR;
+    case SLANG_STAGE_VERTEX:
+        return VK_SHADER_STAGE_VERTEX_BIT;
+    case SLANG_STAGE_MESH:
+        return VK_SHADER_STAGE_MESH_BIT_EXT;
+    case SLANG_STAGE_AMPLIFICATION:
+        return VK_SHADER_STAGE_TASK_BIT_EXT;
+    default:
+        assert(!"unsupported stage.");
+        return VkShaderStageFlags(-1);
     }
 }
 
@@ -186,18 +298,29 @@ VkImageLayout VulkanUtil::getImageLayoutFromState(ResourceState state)
     {
     case ResourceState::ShaderResource:
     case ResourceState::PixelShaderResource:
-    case ResourceState::NonPixelShaderResource: return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    case ResourceState::NonPixelShaderResource:
+        return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
     case ResourceState::UnorderedAccess:
-    case ResourceState::General:                return VK_IMAGE_LAYOUT_GENERAL;
-    case ResourceState::Present:                return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-    case ResourceState::CopySource:             return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    case ResourceState::CopyDestination:        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-    case ResourceState::RenderTarget:           return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-    case ResourceState::DepthWrite:             return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-    case ResourceState::DepthRead:              return VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
-    case ResourceState::ResolveSource:          return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    case ResourceState::ResolveDestination:     return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-    default:                                    return VK_IMAGE_LAYOUT_UNDEFINED;
+    case ResourceState::General:
+        return VK_IMAGE_LAYOUT_GENERAL;
+    case ResourceState::Present:
+        return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+    case ResourceState::CopySource:
+        return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+    case ResourceState::CopyDestination:
+        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+    case ResourceState::RenderTarget:
+        return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+    case ResourceState::DepthWrite:
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+    case ResourceState::DepthRead:
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+    case ResourceState::ResolveSource:
+        return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+    case ResourceState::ResolveDestination:
+        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+    default:
+        return VK_IMAGE_LAYOUT_UNDEFINED;
     }
     return VkImageLayout();
 }
@@ -206,14 +329,23 @@ VkSampleCountFlagBits VulkanUtil::translateSampleCount(uint32_t sampleCount)
 {
     switch (sampleCount)
     {
-    case 1:  return VK_SAMPLE_COUNT_1_BIT;
-    case 2:  return VK_SAMPLE_COUNT_2_BIT;
-    case 4:  return VK_SAMPLE_COUNT_4_BIT;
-    case 8:  return VK_SAMPLE_COUNT_8_BIT;
-    case 16: return VK_SAMPLE_COUNT_16_BIT;
-    case 32: return VK_SAMPLE_COUNT_32_BIT;
-    case 64: return VK_SAMPLE_COUNT_64_BIT;
-    default: assert(!"Unsupported sample count"); return VK_SAMPLE_COUNT_1_BIT;
+    case 1:
+        return VK_SAMPLE_COUNT_1_BIT;
+    case 2:
+        return VK_SAMPLE_COUNT_2_BIT;
+    case 4:
+        return VK_SAMPLE_COUNT_4_BIT;
+    case 8:
+        return VK_SAMPLE_COUNT_8_BIT;
+    case 16:
+        return VK_SAMPLE_COUNT_16_BIT;
+    case 32:
+        return VK_SAMPLE_COUNT_32_BIT;
+    case 64:
+        return VK_SAMPLE_COUNT_64_BIT;
+    default:
+        assert(!"Unsupported sample count");
+        return VK_SAMPLE_COUNT_1_BIT;
     }
 }
 
@@ -221,10 +353,15 @@ VkCullModeFlags VulkanUtil::translateCullMode(CullMode cullMode)
 {
     switch (cullMode)
     {
-    case CullMode::None:  return VK_CULL_MODE_NONE;
-    case CullMode::Front: return VK_CULL_MODE_FRONT_BIT;
-    case CullMode::Back:  return VK_CULL_MODE_BACK_BIT;
-    default:              assert(!"Unsupported cull mode"); return VK_CULL_MODE_NONE;
+    case CullMode::None:
+        return VK_CULL_MODE_NONE;
+    case CullMode::Front:
+        return VK_CULL_MODE_FRONT_BIT;
+    case CullMode::Back:
+        return VK_CULL_MODE_BACK_BIT;
+    default:
+        assert(!"Unsupported cull mode");
+        return VK_CULL_MODE_NONE;
     }
 }
 
@@ -232,9 +369,13 @@ VkFrontFace VulkanUtil::translateFrontFaceMode(FrontFaceMode frontFaceMode)
 {
     switch (frontFaceMode)
     {
-    case FrontFaceMode::CounterClockwise: return VK_FRONT_FACE_COUNTER_CLOCKWISE;
-    case FrontFaceMode::Clockwise:        return VK_FRONT_FACE_CLOCKWISE;
-    default:                              assert(!"Unsupported front face mode"); return VK_FRONT_FACE_CLOCKWISE;
+    case FrontFaceMode::CounterClockwise:
+        return VK_FRONT_FACE_COUNTER_CLOCKWISE;
+    case FrontFaceMode::Clockwise:
+        return VK_FRONT_FACE_CLOCKWISE;
+    default:
+        assert(!"Unsupported front face mode");
+        return VK_FRONT_FACE_CLOCKWISE;
     }
 }
 
@@ -242,9 +383,13 @@ VkPolygonMode VulkanUtil::translateFillMode(FillMode fillMode)
 {
     switch (fillMode)
     {
-    case FillMode::Solid:     return VK_POLYGON_MODE_FILL;
-    case FillMode::Wireframe: return VK_POLYGON_MODE_LINE;
-    default:                  assert(!"Unsupported fill mode"); return VK_POLYGON_MODE_FILL;
+    case FillMode::Solid:
+        return VK_POLYGON_MODE_FILL;
+    case FillMode::Wireframe:
+        return VK_POLYGON_MODE_LINE;
+    default:
+        assert(!"Unsupported fill mode");
+        return VK_POLYGON_MODE_FILL;
     }
 }
 
@@ -252,25 +397,44 @@ VkBlendFactor VulkanUtil::translateBlendFactor(BlendFactor blendFactor)
 {
     switch (blendFactor)
     {
-    case BlendFactor::Zero:                 return VK_BLEND_FACTOR_ZERO;
-    case BlendFactor::One:                  return VK_BLEND_FACTOR_ONE;
-    case BlendFactor::SrcColor:             return VK_BLEND_FACTOR_SRC_COLOR;
-    case BlendFactor::InvSrcColor:          return VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR;
-    case BlendFactor::SrcAlpha:             return VK_BLEND_FACTOR_SRC_ALPHA;
-    case BlendFactor::InvSrcAlpha:          return VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
-    case BlendFactor::DestAlpha:            return VK_BLEND_FACTOR_DST_ALPHA;
-    case BlendFactor::InvDestAlpha:         return VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA;
-    case BlendFactor::DestColor:            return VK_BLEND_FACTOR_DST_COLOR;
-    case BlendFactor::InvDestColor:         return VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA;
-    case BlendFactor::SrcAlphaSaturate:     return VK_BLEND_FACTOR_SRC_ALPHA_SATURATE;
-    case BlendFactor::BlendColor:           return VK_BLEND_FACTOR_CONSTANT_COLOR;
-    case BlendFactor::InvBlendColor:        return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR;
-    case BlendFactor::SecondarySrcColor:    return VK_BLEND_FACTOR_SRC1_COLOR;
-    case BlendFactor::InvSecondarySrcColor: return VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR;
-    case BlendFactor::SecondarySrcAlpha:    return VK_BLEND_FACTOR_SRC1_ALPHA;
-    case BlendFactor::InvSecondarySrcAlpha: return VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA;
-
-    default: assert(!"Unsupported blend factor"); return VK_BLEND_FACTOR_ONE;
+    case BlendFactor::Zero:
+        return VK_BLEND_FACTOR_ZERO;
+    case BlendFactor::One:
+        return VK_BLEND_FACTOR_ONE;
+    case BlendFactor::SrcColor:
+        return VK_BLEND_FACTOR_SRC_COLOR;
+    case BlendFactor::InvSrcColor:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR;
+    case BlendFactor::SrcAlpha:
+        return VK_BLEND_FACTOR_SRC_ALPHA;
+    case BlendFactor::InvSrcAlpha:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
+    case BlendFactor::DestAlpha:
+        return VK_BLEND_FACTOR_DST_ALPHA;
+    case BlendFactor::InvDestAlpha:
+        return VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA;
+    case BlendFactor::DestColor:
+        return VK_BLEND_FACTOR_DST_COLOR;
+    case BlendFactor::InvDestColor:
+        return VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA;
+    case BlendFactor::SrcAlphaSaturate:
+        return VK_BLEND_FACTOR_SRC_ALPHA_SATURATE;
+    case BlendFactor::BlendColor:
+        return VK_BLEND_FACTOR_CONSTANT_COLOR;
+    case BlendFactor::InvBlendColor:
+        return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR;
+    case BlendFactor::SecondarySrcColor:
+        return VK_BLEND_FACTOR_SRC1_COLOR;
+    case BlendFactor::InvSecondarySrcColor:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR;
+    case BlendFactor::SecondarySrcAlpha:
+        return VK_BLEND_FACTOR_SRC1_ALPHA;
+    case BlendFactor::InvSecondarySrcAlpha:
+        return VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA;
+
+    default:
+        assert(!"Unsupported blend factor");
+        return VK_BLEND_FACTOR_ONE;
     }
 }
 
@@ -278,12 +442,19 @@ VkBlendOp VulkanUtil::translateBlendOp(BlendOp op)
 {
     switch (op)
     {
-    case BlendOp::Add:             return VK_BLEND_OP_ADD;
-    case BlendOp::Subtract:        return VK_BLEND_OP_SUBTRACT;
-    case BlendOp::ReverseSubtract: return VK_BLEND_OP_REVERSE_SUBTRACT;
-    case BlendOp::Min:             return VK_BLEND_OP_MIN;
-    case BlendOp::Max:             return VK_BLEND_OP_MAX;
-    default:                       assert(!"Unsupported blend op"); return VK_BLEND_OP_ADD;
+    case BlendOp::Add:
+        return VK_BLEND_OP_ADD;
+    case BlendOp::Subtract:
+        return VK_BLEND_OP_SUBTRACT;
+    case BlendOp::ReverseSubtract:
+        return VK_BLEND_OP_REVERSE_SUBTRACT;
+    case BlendOp::Min:
+        return VK_BLEND_OP_MIN;
+    case BlendOp::Max:
+        return VK_BLEND_OP_MAX;
+    default:
+        assert(!"Unsupported blend op");
+        return VK_BLEND_OP_ADD;
     }
 }
 
@@ -291,11 +462,17 @@ VkPrimitiveTopology VulkanUtil::translatePrimitiveTypeToListTopology(PrimitiveTy
 {
     switch (primitiveType)
     {
-    case PrimitiveType::Point:    return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
-    case PrimitiveType::Line:     return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
-    case PrimitiveType::Triangle: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
-    case PrimitiveType::Patch:    return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST;
-    default:                      assert(!"unknown topology type."); return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+    case PrimitiveType::Point:
+        return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
+    case PrimitiveType::Line:
+        return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
+    case PrimitiveType::Triangle:
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+    case PrimitiveType::Patch:
+        return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST;
+    default:
+        assert(!"unknown topology type.");
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
     }
 }
 
@@ -303,15 +480,24 @@ VkStencilOp VulkanUtil::translateStencilOp(StencilOp op)
 {
     switch (op)
     {
-    case StencilOp::DecrementSaturate: return VK_STENCIL_OP_DECREMENT_AND_CLAMP;
-    case StencilOp::DecrementWrap:     return VK_STENCIL_OP_DECREMENT_AND_WRAP;
-    case StencilOp::IncrementSaturate: return VK_STENCIL_OP_INCREMENT_AND_CLAMP;
-    case StencilOp::IncrementWrap:     return VK_STENCIL_OP_INCREMENT_AND_WRAP;
-    case StencilOp::Invert:            return VK_STENCIL_OP_INVERT;
-    case StencilOp::Keep:              return VK_STENCIL_OP_KEEP;
-    case StencilOp::Replace:           return VK_STENCIL_OP_REPLACE;
-    case StencilOp::Zero:              return VK_STENCIL_OP_ZERO;
-    default:                           return VK_STENCIL_OP_KEEP;
+    case StencilOp::DecrementSaturate:
+        return VK_STENCIL_OP_DECREMENT_AND_CLAMP;
+    case StencilOp::DecrementWrap:
+        return VK_STENCIL_OP_DECREMENT_AND_WRAP;
+    case StencilOp::IncrementSaturate:
+        return VK_STENCIL_OP_INCREMENT_AND_CLAMP;
+    case StencilOp::IncrementWrap:
+        return VK_STENCIL_OP_INCREMENT_AND_WRAP;
+    case StencilOp::Invert:
+        return VK_STENCIL_OP_INVERT;
+    case StencilOp::Keep:
+        return VK_STENCIL_OP_KEEP;
+    case StencilOp::Replace:
+        return VK_STENCIL_OP_REPLACE;
+    case StencilOp::Zero:
+        return VK_STENCIL_OP_ZERO;
+    default:
+        return VK_STENCIL_OP_KEEP;
     }
 }
 
@@ -319,10 +505,12 @@ VkFilter VulkanUtil::translateFilterMode(TextureFilteringMode mode)
 {
     switch (mode)
     {
-    default: return VkFilter(0);
+    default:
+        return VkFilter(0);
 
-#define CASE(SRC, DST) \
-    case TextureFilteringMode::SRC: return VK_FILTER_##DST
+#define CASE(SRC, DST)              \
+    case TextureFilteringMode::SRC: \
+        return VK_FILTER_##DST
 
         CASE(Point, NEAREST);
         CASE(Linear, LINEAR);
@@ -335,10 +523,12 @@ VkSamplerMipmapMode VulkanUtil::translateMipFilterMode(TextureFilteringMode mode
 {
     switch (mode)
     {
-    default: return VkSamplerMipmapMode(0);
+    default:
+        return VkSamplerMipmapMode(0);
 
-#define CASE(SRC, DST) \
-    case TextureFilteringMode::SRC: return VK_SAMPLER_MIPMAP_MODE_##DST
+#define CASE(SRC, DST)              \
+    case TextureFilteringMode::SRC: \
+        return VK_SAMPLER_MIPMAP_MODE_##DST
 
         CASE(Point, NEAREST);
         CASE(Linear, LINEAR);
@@ -351,10 +541,12 @@ VkSamplerAddressMode VulkanUtil::translateAddressingMode(TextureAddressingMode m
 {
     switch (mode)
     {
-    default: return VkSamplerAddressMode(0);
+    default:
+        return VkSamplerAddressMode(0);
 
-#define CASE(SRC, DST) \
-    case TextureAddressingMode::SRC: return VK_SAMPLER_ADDRESS_MODE_##DST
+#define CASE(SRC, DST)               \
+    case TextureAddressingMode::SRC: \
+        return VK_SAMPLER_ADDRESS_MODE_##DST
 
         CASE(Wrap, REPEAT);
         CASE(ClampToEdge, CLAMP_TO_EDGE);
@@ -374,8 +566,9 @@ VkCompareOp VulkanUtil::translateComparisonFunc(ComparisonFunc func)
         // TODO: need to report failures
         return VK_COMPARE_OP_ALWAYS;
 
-#define CASE(FROM, TO) \
-    case ComparisonFunc::FROM: return VK_COMPARE_OP_##TO
+#define CASE(FROM, TO)         \
+    case ComparisonFunc::FROM: \
+        return VK_COMPARE_OP_##TO
 
         CASE(Never, NEVER);
         CASE(Less, LESS);
@@ -406,9 +599,12 @@ VkSamplerReductionMode VulkanUtil::translateReductionOp(TextureReductionOp op)
 {
     switch (op)
     {
-    case gfx::TextureReductionOp::Minimum: return VK_SAMPLER_REDUCTION_MODE_MIN;
-    case gfx::TextureReductionOp::Maximum: return VK_SAMPLER_REDUCTION_MODE_MAX;
-    default:                               return VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE;
+    case gfx::TextureReductionOp::Minimum:
+        return VK_SAMPLER_REDUCTION_MODE_MIN;
+    case gfx::TextureReductionOp::Maximum:
+        return VK_SAMPLER_REDUCTION_MODE_MAX;
+    default:
+        return VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE;
     }
 }
 
@@ -431,12 +627,18 @@ VkSamplerReductionMode VulkanUtil::translateReductionOp(TextureReductionOp op)
 {
     switch (topology)
     {
-    case PrimitiveTopology::LineList:      return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
-    case PrimitiveTopology::LineStrip:     return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
-    case PrimitiveTopology::TriangleList:  return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
-    case PrimitiveTopology::TriangleStrip: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
-    case PrimitiveTopology::PointList:     return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
-    default:                               break;
+    case PrimitiveTopology::LineList:
+        return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
+    case PrimitiveTopology::LineStrip:
+        return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
+    case PrimitiveTopology::TriangleList:
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+    case PrimitiveTopology::TriangleStrip:
+        return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
+    case PrimitiveTopology::PointList:
+        return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
+    default:
+        break;
     }
     assert(!"Unknown topology");
     return VK_PRIMITIVE_TOPOLOGY_MAX_ENUM;
@@ -446,20 +648,32 @@ VkImageLayout VulkanUtil::mapResourceStateToLayout(ResourceState state)
 {
     switch (state)
     {
-    case ResourceState::Undefined:              return VK_IMAGE_LAYOUT_UNDEFINED;
+    case ResourceState::Undefined:
+        return VK_IMAGE_LAYOUT_UNDEFINED;
     case ResourceState::ShaderResource:
     case ResourceState::PixelShaderResource:
-    case ResourceState::NonPixelShaderResource: return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-    case ResourceState::UnorderedAccess:        return VK_IMAGE_LAYOUT_GENERAL;
-    case ResourceState::RenderTarget:           return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-    case ResourceState::DepthRead:              return VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
-    case ResourceState::DepthWrite:             return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-    case ResourceState::Present:                return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-    case ResourceState::CopySource:             return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    case ResourceState::CopyDestination:        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-    case ResourceState::ResolveSource:          return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-    case ResourceState::ResolveDestination:     return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-    default:                                    return VK_IMAGE_LAYOUT_UNDEFINED;
+    case ResourceState::NonPixelShaderResource:
+        return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    case ResourceState::UnorderedAccess:
+        return VK_IMAGE_LAYOUT_GENERAL;
+    case ResourceState::RenderTarget:
+        return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+    case ResourceState::DepthRead:
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+    case ResourceState::DepthWrite:
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+    case ResourceState::Present:
+        return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+    case ResourceState::CopySource:
+        return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+    case ResourceState::CopyDestination:
+        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+    case ResourceState::ResolveSource:
+        return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+    case ResourceState::ResolveDestination:
+        return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+    default:
+        return VK_IMAGE_LAYOUT_UNDEFINED;
     }
 }
 
@@ -546,8 +760,12 @@ Result AccelerationStructureBuildGeometryInfoBuilder::build(
                 vkGeomData.triangles.maxVertex = geomDesc.content.triangles.vertexCount - 1;
                 switch (geomDesc.content.triangles.indexFormat)
                 {
-                case Format::R32_UINT: vkGeomData.triangles.indexType = VK_INDEX_TYPE_UINT32; break;
-                case Format::R16_UINT: vkGeomData.triangles.indexType = VK_INDEX_TYPE_UINT16; break;
+                case Format::R32_UINT:
+                    vkGeomData.triangles.indexType = VK_INDEX_TYPE_UINT32;
+                    break;
+                case Format::R16_UINT:
+                    vkGeomData.triangles.indexType = VK_INDEX_TYPE_UINT16;
+                    break;
                 case Format::Unknown:
                     vkGeomData.triangles.indexType = VK_INDEX_TYPE_NONE_KHR;
                     break;
diff --git a/tools/gfx/vulkan/vk-util.h b/tools/gfx/vulkan/vk-util.h
index a22c76fc3..4bad710a0 100644
--- a/tools/gfx/vulkan/vk-util.h
+++ b/tools/gfx/vulkan/vk-util.h
@@ -85,7 +85,8 @@ struct VulkanUtil
         case VK_FORMAT_D24_UNORM_S8_UINT:
         case VK_FORMAT_X8_D24_UNORM_PACK32:
         case VK_FORMAT_D32_SFLOAT:
-        case VK_FORMAT_D32_SFLOAT_S8_UINT:  return true;
+        case VK_FORMAT_D32_SFLOAT_S8_UINT:
+            return true;
         }
         return false;
     }
@@ -96,7 +97,8 @@ struct VulkanUtil
         {
         case VK_FORMAT_S8_UINT:
         case VK_FORMAT_D24_UNORM_S8_UINT:
-        case VK_FORMAT_D32_SFLOAT_S8_UINT: return true;
+        case VK_FORMAT_D32_SFLOAT_S8_UINT:
+            return true;
         }
         return false;
     }