Skip to content

Commit 7617b82

Browse files
committed
add extension and capabilities to vulkan env
1 parent d2851ae commit 7617b82

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,13 @@ void RequirementHandler::initAvailableCapabilities(const SPIRVSubtarget &ST) {
636636
Capability::DotProductInput4x8BitKHR,
637637
Capability::DotProductInput4x8BitPackedKHR});
638638

639+
// Add capabilities enabled by extensions.
640+
for (auto Extension : ST.getAllAvailableExtensions()) {
641+
CapabilityList EnabledCapabilities =
642+
getCapabilitiesEnabledByExtension(Extension);
643+
addAvailableCaps(EnabledCapabilities);
644+
}
645+
639646
if (ST.isOpenCLEnv()) {
640647
initAvailableCapabilitiesForOpenCL(ST);
641648
return;
@@ -683,13 +690,6 @@ void RequirementHandler::initAvailableCapabilitiesForOpenCL(
683690
// TODO: verify if this needs some checks.
684691
addAvailableCaps({Capability::Float16, Capability::Float64});
685692

686-
// Add capabilities enabled by extensions.
687-
for (auto Extension : ST.getAllAvailableExtensions()) {
688-
CapabilityList EnabledCapabilities =
689-
getCapabilitiesEnabledByExtension(Extension);
690-
addAvailableCaps(EnabledCapabilities);
691-
}
692-
693693
// TODO: add OpenCL extensions.
694694
}
695695

llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ bool SPIRVSubtarget::canDirectlyComparePointers() const {
129129

130130
void SPIRVSubtarget::initAvailableExtensions() {
131131
AvailableExtensions.clear();
132-
if (!isOpenCLEnv())
132+
if (!(isOpenCLEnv() || isVulkanEnv()))
133133
return;
134134

135135
AvailableExtensions.insert(Extensions.begin(), Extensions.end());

0 commit comments

Comments
 (0)