Skip to content

Commit d49b82f

Browse files
committed
Use list not vector
1 parent 1f9543a commit d49b82f

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

source/slang/slang-emit.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -2105,14 +2105,14 @@ SlangResult emitSPIRVForEntryPointsDirectly(
21052105
ComPtr<IArtifact> linkedArtifact;
21062106

21072107
// collect spirv files
2108-
std::vector<uint32_t*> spirvFiles;
2109-
std::vector<uint32_t> spirvSizes;
2108+
List<uint32_t*> spirvFiles;
2109+
List<uint32_t> spirvSizes;
21102110

21112111
// Start with the SPIR-V we just generated.
21122112
// SPIRV-Tools-link expects the size in 32-bit words
21132113
// whereas the spirv blob size is in bytes.
2114-
spirvFiles.push_back((uint32_t*)spirv.getBuffer());
2115-
spirvSizes.push_back(int(spirv.getCount()) / 4);
2114+
spirvFiles.add((uint32_t*)spirv.getBuffer());
2115+
spirvSizes.add(int(spirv.getCount()) / 4);
21162116

21172117
// Iterate over all modules in the linkedIR. For each module, if it
21182118
// contains an embedded downstream ir instruction, add it to the list
@@ -2129,23 +2129,23 @@ SlangResult emitSPIRVForEntryPointsDirectly(
21292129
if (inst->getTarget() == CodeGenTarget::SPIRV)
21302130
{
21312131
auto slice = inst->getBlob()->getStringSlice();
2132-
spirvFiles.push_back((uint32_t*)slice.begin());
2133-
spirvSizes.push_back(int(slice.getLength()) / 4);
2132+
spirvFiles.add((uint32_t*)slice.begin());
2133+
spirvSizes.add(int(slice.getLength()) / 4);
21342134
}
21352135
}
21362136
}
21372137
}
21382138
);
21392139

21402140
SLANG_ASSERT(int(spirv.getCount()) % 4 == 0);
2141-
SLANG_ASSERT(spirvFiles.size() == spirvSizes.size());
2141+
SLANG_ASSERT(spirvFiles.getCount() == spirvSizes.getCount());
21422142

2143-
if (spirvFiles.size() > 1)
2143+
if (spirvFiles.getCount() > 1)
21442144
{
21452145
SlangResult linkresult = compiler->link(
2146-
(const uint32_t**)spirvFiles.data(),
2147-
(const uint32_t*)spirvSizes.data(),
2148-
(uint32_t)spirvFiles.size(),
2146+
(const uint32_t**)spirvFiles.getBuffer(),
2147+
(const uint32_t*)spirvSizes.getBuffer(),
2148+
(uint32_t)spirvFiles.getCount(),
21492149
linkedArtifact.writeRef());
21502150

21512151
if (linkresult != SLANG_OK)

tools/gfx-unit-test/precompiled-module-2.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ void precompiledModule2TestImplCommon(
123123
sessionDesc.targets = &targetDesc;
124124
sessionDesc.fileSystem = memoryFileSystem.get();
125125

126-
std::vector<slang::CompilerOptionEntry> options;
126+
Slang::List<slang::CompilerOptionEntry> options;
127127
slang::CompilerOptionEntry skipDownstreamLinkingOption;
128128
skipDownstreamLinkingOption.name = slang::CompilerOptionName::SkipDownstreamLinking;
129129
skipDownstreamLinkingOption.value.kind = slang::CompilerOptionValueKind::Int;
130130
skipDownstreamLinkingOption.value.intValue0 =
131131
precompilationMode == PrecompilationMode::ExternalLink;
132-
options.push_back(skipDownstreamLinkingOption);
132+
options.add(skipDownstreamLinkingOption);
133133

134-
sessionDesc.compilerOptionEntries = options.data();
135-
sessionDesc.compilerOptionEntryCount = options.size();
134+
sessionDesc.compilerOptionEntries = options.getBuffer();
135+
sessionDesc.compilerOptionEntryCount = options.getCount();
136136
auto globalSession = slangSession->getGlobalSession();
137137
globalSession->createSession(sessionDesc, slangSession.writeRef());
138138

0 commit comments

Comments
 (0)