Updated .clang-format

NVIDIAGameWorks · Aug 26, 2024 · 8236b1f · 8236b1f
1 parent f301196
commit 8236b1f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.clang-format b/.clang-format
@@ -86,7 +86,7 @@ CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DerivePointerAlignment: true
+DerivePointerAlignment: false
 DisableFormat: false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
@@ -231,6 +231,9 @@ Standard: Auto
 TabWidth: 4
 UseTab: Never
 WhitespaceSensitiveMacros:
-  - STRINGIFY
+  - NRI_STRINGIFY
 TypenameMacros:
-  - STRUCT
+  - NRI_STRUCT
+  - NRI_UNION
+  - NRI_NAME
+  - NRI_NAME_REF
diff --git a/Source/D3D12/DeviceD3D12.cpp b/Source/D3D12/DeviceD3D12.cpp
@@ -593,7 +593,7 @@ void DeviceD3D12::FillDesc(const DeviceCreationDesc& deviceCreationDesc) {
     m_Desc.isShaderAtomicsI32Supported = true;
     m_Desc.isShaderAtomicsF32Supported = isShaderAtomicsF32Supported;
 #ifdef NRI_USE_AGILITY_SDK
-    m_Desc.isShaderAtomicsI64Supported = m_Desc.isShaderAtomicsI64Supported|| options9.AtomicInt64OnTypedResourceSupported || options9.AtomicInt64OnGroupSharedSupported || options11.AtomicInt64OnDescriptorHeapResourceSupported;
+    m_Desc.isShaderAtomicsI64Supported = m_Desc.isShaderAtomicsI64Supported || options9.AtomicInt64OnTypedResourceSupported || options9.AtomicInt64OnGroupSharedSupported || options11.AtomicInt64OnDescriptorHeapResourceSupported;
 #endif
 
     m_Desc.isDrawParametersEmulationEnabled = deviceCreationDesc.enableD3D12DrawParametersEmulation && shaderModel.HighestShaderModel <= D3D_SHADER_MODEL_6_7;

diff --git a/Source/Validation/DescriptorPoolVal.cpp b/Source/Validation/DescriptorPoolVal.cpp
@@ -89,7 +89,7 @@ Result DescriptorPoolVal::AllocateDescriptorSets(
     const PipelineLayoutDesc& pipelineLayoutDesc = pipelineLayoutVal.GetPipelineLayoutDesc();
 
     RETURN_ON_FAILURE(&m_Device, instanceNum != 0, Result::INVALID_ARGUMENT, "AllocateDescriptorSets: 'instanceNum' is 0");
-    RETURN_ON_FAILURE(&m_Device, m_DescriptorSetsNum + instanceNum <= m_Desc.descriptorSetMaxNum, Result::INVALID_ARGUMENT,"AllocateDescriptorSets: the maximum number of descriptor sets exceeded");
+    RETURN_ON_FAILURE(&m_Device, m_DescriptorSetsNum + instanceNum <= m_Desc.descriptorSetMaxNum, Result::INVALID_ARGUMENT, "AllocateDescriptorSets: the maximum number of descriptor sets exceeded");
 
     if (!m_SkipValidation) {
         RETURN_ON_FAILURE(&m_Device, setIndexInPipelineLayout < pipelineLayoutDesc.descriptorSetNum, Result::INVALID_ARGUMENT, "AllocateDescriptorSets: 'setIndexInPipelineLayout' is invalid");