Skip to content

[VK] Fix EnabledDeviceExtensions redefinition and drop on macOS build #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bogner merged 1 commit into from
May 29, 2026
Merged

[VK] Fix EnabledDeviceExtensions redefinition and drop on macOS build #1251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions lib/API/VK/Device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,22 +1315,19 @@ class VulkanDevice : public offloadtest::Device {
Features.pNext = &MeshFeatures;
}

DeviceInfo.enabledExtensionCount =
static_cast<uint32_t>(EnabledDeviceExtensions.size());
DeviceInfo.ppEnabledExtensionNames = EnabledDeviceExtensions.data();
DeviceInfo.pEnabledFeatures = &Features.features;
DeviceInfo.pNext = Features.pNext;

#ifdef VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME
llvm::SmallVector<const char *, 1> EnabledDeviceExtensions;
if (HasShaderImageAtomicInt64Ext &&
FeaturesImageAtomicInt64.shaderImageInt64Atomics)
EnabledDeviceExtensions.push_back(
VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME);
DeviceInfo.enabledExtensionCount = EnabledDeviceExtensions.size();
DeviceInfo.ppEnabledExtensionNames = EnabledDeviceExtensions.data();
#endif

DeviceInfo.enabledExtensionCount =
static_cast<uint32_t>(EnabledDeviceExtensions.size());
DeviceInfo.ppEnabledExtensionNames = EnabledDeviceExtensions.data();
DeviceInfo.pEnabledFeatures = &Features.features;
DeviceInfo.pNext = Features.pNext;

VkDevice Device = VK_NULL_HANDLE;
if (auto Err = VK::toError(
vkCreateDevice(PhysicalDevice, &DeviceInfo, nullptr, &Device),
Expand Down
Loading