From a7f1f02119d6fc49052c66dc29600547e311bad9 Mon Sep 17 00:00:00 2001 From: slangbot <186143334+slangbot@users.noreply.github.com> Date: Fri, 28 Feb 2025 20:24:32 +0000 Subject: [PATCH] format code --- include/slang.h | 2 +- .../compiler-core/slang-downstream-compiler.h | 21 +++++++++++-------- .../compiler-core/slang-glslang-compiler.cpp | 16 ++++++++------ source/slang/slang-compiler.h | 4 ++-- source/slang/slang-emit.cpp | 7 +++---- tools/gfx-unit-test/gfx-test-util.cpp | 4 +++- tools/gfx-unit-test/gfx-test-util.h | 14 ++++++------- tools/gfx-unit-test/precompiled-module-2.cpp | 18 ++++++++++++---- tools/gfx/vulkan/vk-shader-program.cpp | 2 +- 9 files changed, 53 insertions(+), 35 deletions(-) diff --git a/include/slang.h b/include/slang.h index 9c7fcd560c..d000dab9f5 100644 --- 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 index 6dfe6ebf84..c96003cc4f 100644 --- 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 index 92233e2849..540b437c5e 100644 --- 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 index f1ed834a60..c7d974d989 100644 --- 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 index e7c50e6381..45c3632111 100644 --- 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,7 +2143,7 @@ SlangResult emitSPIRVForEntryPointsDirectly( spirvSizes.data(), spirvFiles.size(), linkedArtifact.writeRef()); - + if (linkresult != SLANG_OK) { return SLANG_FAIL; @@ -2152,7 +2151,7 @@ SlangResult emitSPIRVForEntryPointsDirectly( ComPtr 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 index c649a13173..d7cfa0f65d 100644 --- 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 index 94a2d97706..3397584fc3 100644 --- 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 index 8bbe8d2828..fb877aa4b6 100644 --- 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 index 719be93d87..2dd9b03264 100644 --- 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);