Skip to content

Commit aea7a39

Browse files
committed
format code
1 parent fc3c2ae commit aea7a39

8 files changed

+16
-16
lines changed

tools/gfx/d3d12/d3d12-shader-program.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using namespace Slang;
1010

1111
Result ShaderProgramImpl::createShaderModule(
1212
slang::EntryPointReflection* entryPointInfo,
13-
List<ComPtr<ISlangBlob> > kernelCodes)
13+
List<ComPtr<ISlangBlob>> kernelCodes)
1414
{
1515
ShaderBinary shaderBin;
1616
shaderBin.stage = entryPointInfo->getStage();

tools/gfx/d3d12/d3d12-shader-program.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ShaderProgramImpl : public ShaderProgramBase
2727

2828
virtual Result createShaderModule(
2929
slang::EntryPointReflection* entryPointInfo,
30-
List<ComPtr<ISlangBlob> > kernelCodes) override;
30+
List<ComPtr<ISlangBlob>> kernelCodes) override;
3131
};
3232

3333
} // namespace d3d12

tools/gfx/metal/metal-shader-program.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ShaderProgramImpl::~ShaderProgramImpl() {}
2121

2222
Result ShaderProgramImpl::createShaderModule(
2323
slang::EntryPointReflection* entryPointInfo,
24-
Slang::List<ComPtr<ISlangBlob> > kernelCodes)
24+
Slang::List<ComPtr<ISlangBlob>> kernelCodes)
2525
{
2626
Module module;
2727
module.stage = entryPointInfo->getStage();

tools/gfx/metal/metal-shader-program.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ShaderProgramImpl : public ShaderProgramBase
3333

3434
virtual Result createShaderModule(
3535
slang::EntryPointReflection* entryPointInfo,
36-
Slang::List<ComPtr<ISlangBlob> > kernelCodes) override;
36+
Slang::List<ComPtr<ISlangBlob>> kernelCodes) override;
3737
};
3838

3939

tools/gfx/renderer-shared.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1179,8 +1179,8 @@ Result ShaderProgramBase::compileShaders(RendererBase* device)
11791179
{
11801180
ComPtr<slang::IBlob> diagnosticsBlob;
11811181
auto result = precompileService->getPrecompiledTargetCode(
1182-
SLANG_SPIRV,
1183-
spirv.writeRef(),
1182+
SLANG_SPIRV,
1183+
spirv.writeRef(),
11841184
diagnosticsBlob.writeRef());
11851185
if (result == SLANG_OK)
11861186
{
@@ -1235,7 +1235,7 @@ Result ShaderProgramBase::compileShaders(RendererBase* device)
12351235

12361236
Result ShaderProgramBase::createShaderModule(
12371237
slang::EntryPointReflection* entryPointInfo,
1238-
Slang::List<ComPtr<ISlangBlob> > kernelCodes)
1238+
Slang::List<ComPtr<ISlangBlob>> kernelCodes)
12391239
{
12401240
SLANG_UNUSED(entryPointInfo);
12411241
SLANG_UNUSED(kernelCodes);

tools/gfx/renderer-shared.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ class ShaderProgramBase : public IShaderProgram, public Slang::ComObject
877877
Slang::Result compileShaders(RendererBase* device);
878878
virtual Slang::Result createShaderModule(
879879
slang::EntryPointReflection* entryPointInfo,
880-
Slang::List<Slang::ComPtr<ISlangBlob> > kernelCodes);
880+
Slang::List<Slang::ComPtr<ISlangBlob>> kernelCodes);
881881

882882
virtual SLANG_NO_THROW slang::TypeReflection* SLANG_MCALL
883883
findTypeByName(const char* name) override

tools/gfx/vulkan/vk-shader-program.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// vk-shader-program.cpp
22
#include "vk-shader-program.h"
33

4+
#include "external/spirv-tools/include/spirv-tools/linker.hpp"
45
#include "vk-device.h"
56
#include "vk-util.h"
67

7-
#include "external/spirv-tools/include/spirv-tools/linker.hpp"
8-
98
namespace gfx
109
{
1110

@@ -71,14 +70,14 @@ VkPipelineShaderStageCreateInfo ShaderProgramImpl::compileEntryPoint(
7170
return shaderStageCreateInfo;
7271
}
7372

74-
static ComPtr<ISlangBlob> LinkWithSPIRVTools(List<ComPtr<ISlangBlob> > kernelCodes)
73+
static ComPtr<ISlangBlob> LinkWithSPIRVTools(List<ComPtr<ISlangBlob>> kernelCodes)
7574
{
7675
spvtools::Context context(SPV_ENV_UNIVERSAL_1_5);
7776
spvtools::LinkerOptions options;
7877
spvtools::MessageConsumer consumer = [](spv_message_level_t level,
79-
const char* source,
80-
const spv_position_t& position,
81-
const char* message)
78+
const char* source,
79+
const spv_position_t& position,
80+
const char* message)
8281
{
8382
printf("SPIRV-TOOLS: %s\n", message);
8483
printf("SPIRV-TOOLS: %s\n", source);
@@ -108,7 +107,8 @@ static ComPtr<ISlangBlob> LinkWithSPIRVTools(List<ComPtr<ISlangBlob> > kernelCod
108107

109108
// Replace kernel code with linked binary
110109
// Creates a new blob with the linked binary
111-
linkedKernelCode = RawBlob::create(linked_binary.data(), linked_binary.size() * sizeof(uint32_t));
110+
linkedKernelCode =
111+
RawBlob::create(linked_binary.data(), linked_binary.size() * sizeof(uint32_t));
112112

113113
return linkedKernelCode;
114114
}

tools/gfx/vulkan/vk-shader-program.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ShaderProgramImpl : public ShaderProgramBase
3737

3838
virtual Result createShaderModule(
3939
slang::EntryPointReflection* entryPointInfo,
40-
List<ComPtr<ISlangBlob> > kernelCodes) override;
40+
List<ComPtr<ISlangBlob>> kernelCodes) override;
4141
};
4242

4343

0 commit comments

Comments
 (0)