Merge pull request #20 from slangbot/format-6500-cheneym2/spvlink2

cheneym2 · web-flow · commit a5a60998dfee · 2025-02-28T15:56:04.000-05:00
Format code for PR #6500
diff --git a/include/slang.h b/include/slang.h
@@ -1010,7 +1010,7 @@ typedef uint32_t SlangSizeT;
         EmitReflectionJSON, // bool
         SaveGLSLModuleBinSource,
 
-        SkipDownstreamLinking,        // bool, experimental
+        SkipDownstreamLinking, // bool, experimental
         CountOf,
     };
 
diff --git a/source/compiler-core/slang-downstream-compiler.h b/source/compiler-core/slang-downstream-compiler.h
@@ -344,15 +344,18 @@ class IDownstreamCompiler : public ICastable
     /// True if underlying compiler uses file system to communicate source
     virtual SLANG_NO_THROW bool SLANG_MCALL isFileBased() = 0;
 
-    virtual SLANG_NO_THROW int SLANG_MCALL
-    link(const uint32_t** modules, const uint32_t* moduleSizes,
-         const uint32_t moduleCount,
-         IArtifact** outArtifact) {
-            SLANG_UNREFERENCED_PARAMETER(modules);
-            SLANG_UNREFERENCED_PARAMETER(moduleSizes);
-            SLANG_UNREFERENCED_PARAMETER(moduleCount);
-            SLANG_UNREFERENCED_PARAMETER(outArtifact);
-            return 0;}
+    virtual SLANG_NO_THROW int SLANG_MCALL link(
+        const uint32_t** modules,
+        const uint32_t* moduleSizes,
+        const uint32_t moduleCount,
+        IArtifact** outArtifact)
+    {
+        SLANG_UNREFERENCED_PARAMETER(modules);
+        SLANG_UNREFERENCED_PARAMETER(moduleSizes);
+        SLANG_UNREFERENCED_PARAMETER(moduleCount);
+        SLANG_UNREFERENCED_PARAMETER(outArtifact);
+        return 0;
+    }
 };
 
 class DownstreamCompilerBase : public ComBaseObject, public IDownstreamCompiler
diff --git a/source/compiler-core/slang-glslang-compiler.cpp b/source/compiler-core/slang-glslang-compiler.cpp
@@ -49,9 +49,11 @@ class GlslangDownstreamCompiler : public DownstreamCompilerBase
     validate(const uint32_t* contents, int contentsSize) SLANG_OVERRIDE;
     virtual SLANG_NO_THROW SlangResult SLANG_MCALL
     disassemble(const uint32_t* contents, int contentsSize) SLANG_OVERRIDE;
-    int link(const uint32_t** modules, const uint32_t* moduleSizes,
-             const uint32_t moduleCount,
-             IArtifact** outArtifact) SLANG_OVERRIDE;
+    int link(
+        const uint32_t** modules,
+        const uint32_t* moduleSizes,
+        const uint32_t moduleCount,
+        IArtifact** outArtifact) SLANG_OVERRIDE;
 
     /// Must be called before use
     SlangResult init(ISlangSharedLibrary* library);
@@ -328,9 +330,11 @@ SlangResult GlslangDownstreamCompiler::disassemble(const uint32_t* contents, int
     return SLANG_FAIL;
 }
 
-SlangResult GlslangDownstreamCompiler::link(const uint32_t** modules, const uint32_t* moduleSizes,
-                                            const uint32_t moduleCount,
-                                            IArtifact** outArtifact)
+SlangResult GlslangDownstreamCompiler::link(
+    const uint32_t** modules,
+    const uint32_t* moduleSizes,
+    const uint32_t moduleCount,
+    IArtifact** outArtifact)
 {
     glslang_LinkRequest request;
     memset(&request, 0, sizeof(request));
diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h
@@ -1384,8 +1384,8 @@ enum class PassThroughMode : SlangPassThroughIntegral
     LLVM = SLANG_PASS_THROUGH_LLVM,                  ///< LLVM 'compiler'
     SpirvOpt = SLANG_PASS_THROUGH_SPIRV_OPT,         ///< pass thorugh spirv to spirv-opt
     MetalC = SLANG_PASS_THROUGH_METAL,
-    Tint = SLANG_PASS_THROUGH_TINT, ///< pass through spirv to Tint API
-    SpirvLink = SLANG_PASS_THROUGH_SPIRV_LINK,       ///< pass through spirv to spirv-link
+    Tint = SLANG_PASS_THROUGH_TINT,            ///< pass through spirv to Tint API
+    SpirvLink = SLANG_PASS_THROUGH_SPIRV_LINK, ///< pass through spirv to spirv-link
     CountOf = SLANG_PASS_THROUGH_COUNT_OF,
 };
 void printDiagnosticArg(StringBuilder& sb, PassThroughMode val);
diff --git a/source/slang/slang-emit.cpp b/source/slang/slang-emit.cpp
@@ -2134,8 +2134,7 @@ SlangResult emitSPIRVForEntryPointsDirectly(
                             }
                         }
                     }
-                }
-            );
+                });
 
             SLANG_ASSERT(int(spirv.getCount()) % 4 == 0);
             SLANG_ASSERT(spirvFiles.size() == spirvSizes.size());
@@ -2144,15 +2143,15 @@ SlangResult emitSPIRVForEntryPointsDirectly(
                 (const uint32_t*)spirvSizes.data(),
                 (uint32_t)spirvFiles.size(),
                 linkedArtifact.writeRef());
-            
+
             if (linkresult != SLANG_OK)
             {
                 return SLANG_FAIL;
             }
 
             ComPtr<ISlangBlob> blob;
             linkedArtifact->loadBlob(ArtifactKeep::No, blob.writeRef());
-			
+
             artifact = _Move(linkedArtifact);
         }
 
diff --git a/tools/gfx-unit-test/gfx-test-util.cpp b/tools/gfx-unit-test/gfx-test-util.cpp
@@ -119,7 +119,9 @@ Slang::Result loadComputeProgram(
     if (precompilationMode == PrecompilationMode::ExternalLink)
     {
         programDesc.downstreamLinkMode = gfx::IShaderProgram::DownstreamLinkMode::Deferred;
-    } else {
+    }
+    else
+    {
         programDesc.downstreamLinkMode = gfx::IShaderProgram::DownstreamLinkMode::None;
     }
 
diff --git a/tools/gfx-unit-test/gfx-test-util.h b/tools/gfx-unit-test/gfx-test-util.h
@@ -7,13 +7,13 @@
 
 namespace gfx_test
 {
-    enum class PrecompilationMode
-    {
-        None,
-        SlangIR,
-        InternalLink,
-        ExternalLink,    
-    };
+enum class PrecompilationMode
+{
+    None,
+    SlangIR,
+    InternalLink,
+    ExternalLink,
+};
 /// Helper function for print out diagnostic messages output by Slang compiler.
 void diagnoseIfNeeded(slang::IBlob* diagnosticsBlob);
 
diff --git a/tools/gfx-unit-test/precompiled-module-2.cpp b/tools/gfx-unit-test/precompiled-module-2.cpp
@@ -241,14 +241,18 @@ SLANG_UNIT_TEST(precompiledModule2D3D12)
 
 SLANG_UNIT_TEST(precompiledTargetModuleInternalLink2D3D12)
 {
-    runTestImpl(precompiledTargetModule2InternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::D3D12);
+    runTestImpl(
+        precompiledTargetModule2InternalLinkTestImpl,
+        unitTestContext,
+        Slang::RenderApiFlag::D3D12);
 }
 
 /*
 // Unavailable on D3D12/DXIL currently
 SLANG_UNIT_TEST(precompiledTargetModuleExternalLink2D3D12)
 {
-    runTestImpl(precompiledTargetModule2ExternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::D3D12);
+    runTestImpl(precompiledTargetModule2ExternalLinkTestImpl, unitTestContext,
+Slang::RenderApiFlag::D3D12);
 }
 */
 
@@ -259,12 +263,18 @@ SLANG_UNIT_TEST(precompiledModule2Vulkan)
 
 SLANG_UNIT_TEST(precompiledTargetModule2InternalLinkVulkan)
 {
-    runTestImpl(precompiledTargetModule2InternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan);
+    runTestImpl(
+        precompiledTargetModule2InternalLinkTestImpl,
+        unitTestContext,
+        Slang::RenderApiFlag::Vulkan);
 }
 
 SLANG_UNIT_TEST(precompiledTargetModule2ExternalLinkVulkan)
 {
-    runTestImpl(precompiledTargetModule2ExternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan);
+    runTestImpl(
+        precompiledTargetModule2ExternalLinkTestImpl,
+        unitTestContext,
+        Slang::RenderApiFlag::Vulkan);
 }
 
 } // namespace gfx_test
diff --git a/tools/gfx/vulkan/vk-shader-program.cpp b/tools/gfx/vulkan/vk-shader-program.cpp
@@ -80,7 +80,7 @@ Result ShaderProgramImpl::createShaderModule(
     if (kernelCodes.getCount() == 1)
     {
         linkedKernel = kernelCodes[0];
-    } 
+    }
     else
     {
         linkedKernel = m_device->m_glslang.linkSPIRV(kernelCodes);

Original file line number	Diff line number	Diff line change
`@@ -2134,8 +2134,7 @@ SlangResult emitSPIRVForEntryPointsDirectly(`
`2134`	`2134`	`}`
`2135`	`2135`	`}`
`2136`	`2136`	`}`
`2137`		`- }`
`2138`		`- );`
	`2137`	`+ });`
`2139`	`2138`
`2140`	`2139`	`SLANG_ASSERT(int(spirv.getCount()) % 4 == 0);`
`2141`	`2140`	`SLANG_ASSERT(spirvFiles.size() == spirvSizes.size());`
`@@ -2144,15 +2143,15 @@ SlangResult emitSPIRVForEntryPointsDirectly(`
`2144`	`2143`	`(const uint32_t*)spirvSizes.data(),`
`2145`	`2144`	`(uint32_t)spirvFiles.size(),`
`2146`	`2145`	`linkedArtifact.writeRef());`
`2147`		`-`
	`2146`	`+`
`2148`	`2147`	`if (linkresult != SLANG_OK)`
`2149`	`2148`	`{`
`2150`	`2149`	`return SLANG_FAIL;`
`2151`	`2150`	`}`
`2152`	`2151`
`2153`	`2152`	`ComPtr<ISlangBlob> blob;`
`2154`	`2153`	`linkedArtifact->loadBlob(ArtifactKeep::No, blob.writeRef());`
`2155`		`-`
	`2154`	`+`
`2156`	`2155`	`artifact = _Move(linkedArtifact);`
`2157`	`2156`	`}`
`2158`	`2157`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,9 @@ Slang::Result loadComputeProgram(`
`119`	`119`	`if (precompilationMode == PrecompilationMode::ExternalLink)`
`120`	`120`	`{`
`121`	`121`	`programDesc.downstreamLinkMode = gfx::IShaderProgram::DownstreamLinkMode::Deferred;`
`122`		`- } else {`
	`122`	`+ }`
	`123`	`+ else`
	`124`	`+ {`
`123`	`125`	`programDesc.downstreamLinkMode = gfx::IShaderProgram::DownstreamLinkMode::None;`
`124`	`126`	`}`
`125`	`127`
Original file line number	Diff line number	Diff line change
`@@ -241,14 +241,18 @@ SLANG_UNIT_TEST(precompiledModule2D3D12)`
`241`	`241`
`242`	`242`	`SLANG_UNIT_TEST(precompiledTargetModuleInternalLink2D3D12)`
`243`	`243`	`{`
`244`		`- runTestImpl(precompiledTargetModule2InternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::D3D12);`
	`244`	`+ runTestImpl(`
	`245`	`+ precompiledTargetModule2InternalLinkTestImpl,`
	`246`	`+ unitTestContext,`
	`247`	`+ Slang::RenderApiFlag::D3D12);`
`245`	`248`	`}`
`246`	`249`
`247`	`250`	`/*`
`248`	`251`	`// Unavailable on D3D12/DXIL currently`
`249`	`252`	`SLANG_UNIT_TEST(precompiledTargetModuleExternalLink2D3D12)`
`250`	`253`	`{`
`251`		`- runTestImpl(precompiledTargetModule2ExternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::D3D12);`
	`254`	`+ runTestImpl(precompiledTargetModule2ExternalLinkTestImpl, unitTestContext,`
	`255`	`+Slang::RenderApiFlag::D3D12);`
`252`	`256`	`}`
`253`	`257`	`*/`
`254`	`258`
`@@ -259,12 +263,18 @@ SLANG_UNIT_TEST(precompiledModule2Vulkan)`
`259`	`263`
`260`	`264`	`SLANG_UNIT_TEST(precompiledTargetModule2InternalLinkVulkan)`
`261`	`265`	`{`
`262`		`- runTestImpl(precompiledTargetModule2InternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan);`
	`266`	`+ runTestImpl(`
	`267`	`+ precompiledTargetModule2InternalLinkTestImpl,`
	`268`	`+ unitTestContext,`
	`269`	`+ Slang::RenderApiFlag::Vulkan);`
`263`	`270`	`}`
`264`	`271`
`265`	`272`	`SLANG_UNIT_TEST(precompiledTargetModule2ExternalLinkVulkan)`
`266`	`273`	`{`
`267`		`- runTestImpl(precompiledTargetModule2ExternalLinkTestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan);`
	`274`	`+ runTestImpl(`
	`275`	`+ precompiledTargetModule2ExternalLinkTestImpl,`
	`276`	`+ unitTestContext,`
	`277`	`+ Slang::RenderApiFlag::Vulkan);`
`268`	`278`	`}`
`269`	`279`
`270`	`280`	`} // namespace gfx_test`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ Result ShaderProgramImpl::createShaderModule(`
`80`	`80`	`if (kernelCodes.getCount() == 1)`
`81`	`81`	`{`
`82`	`82`	`linkedKernel = kernelCodes[0];`
`83`		`- }`
	`83`	`+ }`
`84`	`84`	`else`
`85`	`85`	`{`
`86`	`86`	`linkedKernel = m_device->m_glslang.linkSPIRV(kernelCodes);`