From 590d7b6107c446c058f4ca7efff83b83f577f51e Mon Sep 17 00:00:00 2001 From: slangbot <186143334+slangbot@users.noreply.github.com> Date: Fri, 31 Jan 2025 16:13:38 +0000 Subject: [PATCH] format code --- tools/gfx/d3d12/d3d12-shader-program.cpp | 2 +- tools/gfx/d3d12/d3d12-shader-program.h | 2 +- tools/gfx/metal/metal-shader-program.cpp | 2 +- tools/gfx/metal/metal-shader-program.h | 2 +- tools/gfx/renderer-shared.cpp | 8 ++++---- tools/gfx/renderer-shared.h | 2 +- tools/gfx/vulkan/vk-shader-program.cpp | 20 ++++++++++---------- tools/gfx/vulkan/vk-shader-program.h | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/gfx/d3d12/d3d12-shader-program.cpp b/tools/gfx/d3d12/d3d12-shader-program.cpp index 15070395b8..b1e50bb40b 100644 --- a/tools/gfx/d3d12/d3d12-shader-program.cpp +++ b/tools/gfx/d3d12/d3d12-shader-program.cpp @@ -10,7 +10,7 @@ using namespace Slang; Result ShaderProgramImpl::createShaderModule( slang::EntryPointReflection* entryPointInfo, - List > kernelCodes) + List> kernelCodes) { ShaderBinary shaderBin; shaderBin.stage = entryPointInfo->getStage(); diff --git a/tools/gfx/d3d12/d3d12-shader-program.h b/tools/gfx/d3d12/d3d12-shader-program.h index 8f3d3cb1f9..fad4e7ad01 100644 --- a/tools/gfx/d3d12/d3d12-shader-program.h +++ b/tools/gfx/d3d12/d3d12-shader-program.h @@ -27,7 +27,7 @@ class ShaderProgramImpl : public ShaderProgramBase virtual Result createShaderModule( slang::EntryPointReflection* entryPointInfo, - List > kernelCodes) override; + List> kernelCodes) override; }; } // namespace d3d12 diff --git a/tools/gfx/metal/metal-shader-program.cpp b/tools/gfx/metal/metal-shader-program.cpp index 7931e9babb..d528ba35c7 100644 --- a/tools/gfx/metal/metal-shader-program.cpp +++ b/tools/gfx/metal/metal-shader-program.cpp @@ -21,7 +21,7 @@ ShaderProgramImpl::~ShaderProgramImpl() {} Result ShaderProgramImpl::createShaderModule( slang::EntryPointReflection* entryPointInfo, - Slang::List > kernelCodes) + Slang::List> kernelCodes) { Module module; module.stage = entryPointInfo->getStage(); diff --git a/tools/gfx/metal/metal-shader-program.h b/tools/gfx/metal/metal-shader-program.h index fb9ad80d68..a82aae414e 100644 --- a/tools/gfx/metal/metal-shader-program.h +++ b/tools/gfx/metal/metal-shader-program.h @@ -33,7 +33,7 @@ class ShaderProgramImpl : public ShaderProgramBase virtual Result createShaderModule( slang::EntryPointReflection* entryPointInfo, - Slang::List > kernelCodes) override; + Slang::List> kernelCodes) override; }; diff --git a/tools/gfx/renderer-shared.cpp b/tools/gfx/renderer-shared.cpp index d92461776f..5cd3116f14 100644 --- a/tools/gfx/renderer-shared.cpp +++ b/tools/gfx/renderer-shared.cpp @@ -1110,7 +1110,7 @@ Result ShaderProgramBase::compileShaders(RendererBase* device) { auto stage = entryPointInfo->getStage(); - List > kernelCodes; + List> kernelCodes; ComPtr kernelCode; { ComPtr diagnostics; @@ -1179,8 +1179,8 @@ Result ShaderProgramBase::compileShaders(RendererBase* device) { ComPtr diagnosticsBlob; auto result = precompileService->getPrecompiledTargetCode( - SLANG_SPIRV, - spirv.writeRef(), + SLANG_SPIRV, + spirv.writeRef(), diagnosticsBlob.writeRef()); if (result == SLANG_OK) { @@ -1235,7 +1235,7 @@ Result ShaderProgramBase::compileShaders(RendererBase* device) Result ShaderProgramBase::createShaderModule( slang::EntryPointReflection* entryPointInfo, - Slang::List > kernelCodes) + Slang::List> kernelCodes) { SLANG_UNUSED(entryPointInfo); SLANG_UNUSED(kernelCodes); diff --git a/tools/gfx/renderer-shared.h b/tools/gfx/renderer-shared.h index 94a51788a5..17d3d3fc0e 100644 --- a/tools/gfx/renderer-shared.h +++ b/tools/gfx/renderer-shared.h @@ -877,7 +877,7 @@ class ShaderProgramBase : public IShaderProgram, public Slang::ComObject Slang::Result compileShaders(RendererBase* device); virtual Slang::Result createShaderModule( slang::EntryPointReflection* entryPointInfo, - Slang::List > kernelCodes); + Slang::List> kernelCodes); virtual SLANG_NO_THROW slang::TypeReflection* SLANG_MCALL findTypeByName(const char* name) override diff --git a/tools/gfx/vulkan/vk-shader-program.cpp b/tools/gfx/vulkan/vk-shader-program.cpp index c486829f30..3e48ceb284 100644 --- a/tools/gfx/vulkan/vk-shader-program.cpp +++ b/tools/gfx/vulkan/vk-shader-program.cpp @@ -1,11 +1,10 @@ // vk-shader-program.cpp #include "vk-shader-program.h" +#include "external/spirv-tools/include/spirv-tools/linker.hpp" #include "vk-device.h" #include "vk-util.h" -#include "external/spirv-tools/include/spirv-tools/linker.hpp" - namespace gfx { @@ -71,14 +70,14 @@ VkPipelineShaderStageCreateInfo ShaderProgramImpl::compileEntryPoint( return shaderStageCreateInfo; } -static ComPtr LinkWithSPIRVTools(List > kernelCodes) +static ComPtr LinkWithSPIRVTools(List> kernelCodes) { spvtools::Context context(SPV_ENV_UNIVERSAL_1_5); spvtools::LinkerOptions options; spvtools::MessageConsumer consumer = [](spv_message_level_t level, - const char* source, - const spv_position_t& position, - const char* message) + const char* source, + const spv_position_t& position, + const char* message) { printf("SPIRV-TOOLS: %s\n", message); printf("SPIRV-TOOLS: %s\n", source); @@ -108,7 +107,8 @@ static ComPtr LinkWithSPIRVTools(List > kernelCod // Replace kernel code with linked binary // Creates a new blob with the linked binary - linkedKernelCode = RawBlob::create(linked_binary.data(), linked_binary.size() * sizeof(uint32_t)); + linkedKernelCode = + RawBlob::create(linked_binary.data(), linked_binary.size() * sizeof(uint32_t)); return linkedKernelCode; } @@ -116,8 +116,8 @@ Result ShaderProgramImpl::createShaderModule( slang::EntryPointReflection* entryPointInfo, List> kernelCodes) { - //for (auto kernelCode : kernelCodes) - // m_codeBlobs.add(kernelCode); + // for (auto kernelCode : kernelCodes) + // m_codeBlobs.add(kernelCode); ComPtr linkedKernel = LinkWithSPIRVTools(kernelCodes); m_codeBlobs.add(linkedKernel); @@ -130,7 +130,7 @@ Result ShaderProgramImpl::createShaderModule( linkedKernel, (VkShaderStageFlagBits)VulkanUtil::getShaderStage(entryPointInfo->getStage()), shaderModule)); - + m_entryPointNames.add(realEntryPointName); m_modules.add(shaderModule); return SLANG_OK; diff --git a/tools/gfx/vulkan/vk-shader-program.h b/tools/gfx/vulkan/vk-shader-program.h index 3860db58e4..0fd01eb4cf 100644 --- a/tools/gfx/vulkan/vk-shader-program.h +++ b/tools/gfx/vulkan/vk-shader-program.h @@ -37,7 +37,7 @@ class ShaderProgramImpl : public ShaderProgramBase virtual Result createShaderModule( slang::EntryPointReflection* entryPointInfo, - List > kernelCodes) override; + List> kernelCodes) override; };