format

* format

* Minor test fixes

* enable checking cpp format in ci

1 files changed, 57 insertions, 47 deletions

diff --git a/tools/gfx/vulkan/vk-shader-object-layout.cpp b/tools/gfx/vulkan/vk-shader-object-layout.cpp
index d84627e86..6129246cb 100644
--- a/tools/gfx/vulkan/vk-shader-object-layout.cpp
+++ b/tools/gfx/vulkan/vk-shader-object-layout.cpp
@@ -31,33 +31,22 @@ 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;
     }
 }
 
@@ -65,7 +54,8 @@ VkDescriptorType ShaderObjectLayoutImpl::Builder::_mapDescriptorType(
 /// sub-object described by `typeLayout`, at the given `offset`.
 
 void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
-    slang::TypeLayoutReflection* typeLayout, BindingOffset const& offset)
+    slang::TypeLayoutReflection* typeLayout,
+    BindingOffset const& offset)
 {
     // First we will scan through all the descriptor sets that the Slang reflection
     // information believes go into making up the given type.
@@ -94,8 +84,7 @@ 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.
@@ -103,8 +92,7 @@ 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
@@ -126,7 +114,8 @@ void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
         {
             Index descriptorRangeIndex = firstDescriptorRangeIndex + j;
             auto slangDescriptorType = typeLayout->getDescriptorSetDescriptorRangeType(
-                slangDescriptorSetIndex, descriptorRangeIndex);
+                slangDescriptorSetIndex,
+                descriptorRangeIndex);
 
             // Certain kinds of descriptor ranges reflected by Slang do not
             // manifest as descriptors at the Vulkan level, so we will skip those.
@@ -135,20 +124,20 @@ 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);
             VkDescriptorSetLayoutBinding vkBindingRangeDesc = {};
             vkBindingRangeDesc.binding =
                 offset.binding + (uint32_t)typeLayout->getDescriptorSetDescriptorRangeIndexOffset(
-                                     slangDescriptorSetIndex, descriptorRangeIndex);
+                                     slangDescriptorSetIndex,
+                                     descriptorRangeIndex);
             vkBindingRangeDesc.descriptorCount =
                 (uint32_t)typeLayout->getDescriptorSetDescriptorRangeDescriptorCount(
-                    slangDescriptorSetIndex, descriptorRangeIndex);
+                    slangDescriptorSetIndex,
+                    descriptorRangeIndex);
             vkBindingRangeDesc.descriptorType = vkDescriptorType;
             vkBindingRangeDesc.stageFlags = VK_SHADER_STAGE_ALL;
 
@@ -181,8 +170,7 @@ 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
@@ -221,7 +209,9 @@ void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
                 elementOffset += BindingOffset(elementVarLayout);
 
                 _addDescriptorRangesAsConstantBuffer(
-                    elementTypeLayout, containerOffset, elementOffset);
+                    elementTypeLayout,
+                    containerOffset,
+                    elementOffset);
             }
             break;
 
@@ -252,7 +242,9 @@ void ShaderObjectLayoutImpl::Builder::_addDescriptorRangesAsValue(
                 elementOffset += BindingOffset(elementVarLayout);
 
                 _addDescriptorRangesAsPushConstantBuffer(
-                    elementTypeLayout, containerOffset, elementOffset);
+                    elementTypeLayout,
+                    containerOffset,
+                    elementOffset);
             }
             break;
         }
@@ -416,7 +408,8 @@ void ShaderObjectLayoutImpl::Builder::addBindingRanges(slang::TypeLayoutReflecti
 
             auto set = typeLayout->getDescriptorSetSpaceOffset(descriptorSetIndex);
             auto bindingOffset = typeLayout->getDescriptorSetDescriptorRangeIndexOffset(
-                descriptorSetIndex, descriptorRangeIndex);
+                descriptorSetIndex,
+                descriptorRangeIndex);
 
             bindingRangeInfo.setOffset = uint32_t(set);
             bindingRangeInfo.bindingOffset = uint32_t(bindingOffset);
@@ -449,7 +442,10 @@ void ShaderObjectLayoutImpl::Builder::addBindingRanges(slang::TypeLayoutReflecti
                 auto varLayout = slangLeafTypeLayout->getElementVarLayout();
                 auto subTypeLayout = varLayout->getTypeLayout();
                 ShaderObjectLayoutImpl::createForElementType(
-                    m_renderer, m_session, subTypeLayout, subObjectLayout.writeRef());
+                    m_renderer,
+                    m_session,
+                    subTypeLayout,
+                    subObjectLayout.writeRef());
             }
             break;
 
@@ -457,7 +453,10 @@ void ShaderObjectLayoutImpl::Builder::addBindingRanges(slang::TypeLayoutReflecti
             if (auto pendingTypeLayout = slangLeafTypeLayout->getPendingDataTypeLayout())
             {
                 ShaderObjectLayoutImpl::createForElementType(
-                    m_renderer, m_session, pendingTypeLayout, subObjectLayout.writeRef());
+                    m_renderer,
+                    m_session,
+                    pendingTypeLayout,
+                    subObjectLayout.writeRef());
             }
             break;
         }
@@ -509,8 +508,7 @@ void ShaderObjectLayoutImpl::Builder::addBindingRanges(slang::TypeLayoutReflecti
             }
             break;
 
-        default:
-            break;
+        default: break;
         }
 
         m_subObjectRanges.add(subObjectRange);
@@ -602,7 +600,9 @@ Result ShaderObjectLayoutImpl::createForElementType(
     // since that is how things will be laid out inside the parameter block.
     //
     builder._addDescriptorRangesAsConstantBuffer(
-        builder.m_elementTypeLayout, containerOffset, elementOffset);
+        builder.m_elementTypeLayout,
+        containerOffset,
+        elementOffset);
     return builder.build(outLayout);
 }
 
@@ -611,7 +611,9 @@ ShaderObjectLayoutImpl::~ShaderObjectLayoutImpl()
     for (auto& descSetInfo : m_descriptorSetInfos)
     {
         getDevice()->m_api.vkDestroyDescriptorSetLayout(
-            getDevice()->m_api.m_device, descSetInfo.descriptorSetLayout, nullptr);
+            getDevice()->m_api.m_device,
+            descSetInfo.descriptorSetLayout,
+            nullptr);
     }
 }
 
@@ -645,7 +647,10 @@ Result ShaderObjectLayoutImpl::_init(Builder const* builder)
         createInfo.bindingCount = (uint32_t)descriptorSetInfo.vkBindings.getCount();
         VkDescriptorSetLayout vkDescSetLayout;
         SLANG_RETURN_ON_FAIL(renderer->m_api.vkCreateDescriptorSetLayout(
-            renderer->m_api.m_device, &createInfo, nullptr, &vkDescSetLayout));
+            renderer->m_api.m_device,
+            &createInfo,
+            nullptr,
+            &vkDescSetLayout));
         descriptorSetInfo.descriptorSetLayout = vkDescSetLayout;
     }
     return SLANG_OK;
@@ -693,7 +698,9 @@ RootShaderObjectLayout::~RootShaderObjectLayout()
     if (m_pipelineLayout)
     {
         m_renderer->m_api.vkDestroyPipelineLayout(
-            m_renderer->m_api.m_device, m_pipelineLayout, nullptr);
+            m_renderer->m_api.m_device,
+            m_pipelineLayout,
+            nullptr);
     }
 }
 
@@ -790,7 +797,10 @@ Result RootShaderObjectLayout::_init(Builder const* builder)
         pipelineLayoutCreateInfo.pPushConstantRanges = m_allPushConstantRanges.getBuffer();
     }
     SLANG_RETURN_ON_FAIL(m_renderer->m_api.vkCreatePipelineLayout(
-        m_renderer->m_api.m_device, &pipelineLayoutCreateInfo, nullptr, &m_pipelineLayout));
+        m_renderer->m_api.m_device,
+        &pipelineLayoutCreateInfo,
+        nullptr,
+        &m_pipelineLayout));
     return SLANG_OK;
 }