Skip to content
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

Add Vulkan 1.3 and 1.4 capability checks #6063

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add Vulkan 1.3 and 1.4 capability checks #6063

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05e70a1
Add Vulkan 1.3 and 1.4 capability checks
alan-baker Mar 24, 2025
208badb
formatting
alan-baker Mar 25, 2025
117ee74
add missed caps
alan-baker Mar 25, 2025
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
69 changes: 69 additions & 0 deletions source/val/validate_capability.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,47 @@ bool IsSupportGuaranteedVulkan_1_2(uint32_t capability) {
return false;
}

bool IsSupportGuaranteedVulkan_1_3(uint32_t capability) {
if (IsSupportGuaranteedVulkan_1_2(capability)) return true;
switch (spv::Capability(capability)) {
case spv::Capability::DotProduct:
case spv::Capability::DotProductInputAll:
case spv::Capability::DotProductInput4x8Bit:
case spv::Capability::DotProductInput4x8BitPacked:
case spv::Capability::VulkanMemoryModel:
case spv::Capability::VulkanMemoryModelDeviceScope:
case spv::Capability::PhysicalStorageBufferAddresses:
case spv::Capability::DemoteToHelperInvocation:
return true;
default:
break;
}
return false;
}

bool IsSupportGuaranteedVulkan_1_4(uint32_t capability) {
if (IsSupportGuaranteedVulkan_1_3(capability)) return true;
switch (spv::Capability(capability)) {
case spv::Capability::UniformBufferArrayDynamicIndexing:
case spv::Capability::SampledImageArrayDynamicIndexing:
case spv::Capability::StorageBufferArrayDynamicIndexing:
case spv::Capability::StorageImageArrayDynamicIndexing:
case spv::Capability::Int16:
case spv::Capability::StorageBuffer16BitAccess:
case spv::Capability::VariablePointers:
case spv::Capability::VariablePointersStorageBuffer:
case spv::Capability::UniformTexelBufferArrayDynamicIndexing:
case spv::Capability::StorageTexelBufferArrayDynamicIndexing:
case spv::Capability::Int8:
case spv::Capability::StorageBuffer8BitAccess:
case spv::Capability::FloatControls2:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From https://docs.vulkan.org/spec/latest/chapters/features.html#:~:text=If%20Vulkan%201.4%20is%20supported%2C%20the%20following%20features%20must%20be%20supported I also get:

  • ExpectAssumeKHR
  • SampleRateShading
  • StorageImageExtendedFormats
  • ImageGatherExtentded
  • StorageBuffer16BitAccess

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.4 didn't have a new SPIR-V version so I skipped any capabilities that require an extension anyways (so ExpectAssumeKHR).

16-bit storage is further up the list. The other three I'll add.

return true;
default:
break;
}
return false;
}

bool IsSupportOptionalVulkan_1_0(uint32_t capability) {
switch (spv::Capability(capability)) {
case spv::Capability::Geometry:
Expand Down Expand Up @@ -171,6 +212,16 @@ bool IsSupportOptionalVulkan_1_2(uint32_t capability) {
return false;
}

// Vulkan 1.3 only added required features.
bool IsSupportOptionalVulkan_1_3(uint32_t capability) {
return IsSupportOptionalVulkan_1_2(capability);
}

// Vulkan 1.4 only added required features.
bool IsSupportOptionalVulkan_1_4(uint32_t capability) {
return IsSupportOptionalVulkan_1_3(capability);
}

bool IsSupportGuaranteedOpenCL_1_2(uint32_t capability, bool embedded_profile) {
switch (spv::Capability(capability)) {
case spv::Capability::Addresses:
Expand Down Expand Up @@ -340,6 +391,24 @@ spv_result_t CapabilityPass(ValidationState_t& _, const Instruction* inst) {
<< " is not allowed by Vulkan 1.2 specification"
<< " (or requires extension)";
}
} else if (env == SPV_ENV_VULKAN_1_3) {
if (!IsSupportGuaranteedVulkan_1_3(capability) &&
!IsSupportOptionalVulkan_1_3(capability) &&
!IsEnabledByExtension(_, capability)) {
return _.diag(SPV_ERROR_INVALID_CAPABILITY, inst)
<< "Capability " << capability_str()
<< " is not allowed by Vulkan 1.3 specification"
<< " (or requires extension)";
}
} else if (env == SPV_ENV_VULKAN_1_4) {
if (!IsSupportGuaranteedVulkan_1_4(capability) &&
!IsSupportOptionalVulkan_1_4(capability) &&
!IsEnabledByExtension(_, capability)) {
return _.diag(SPV_ERROR_INVALID_CAPABILITY, inst)
<< "Capability " << capability_str()
<< " is not allowed by Vulkan 1.4 specification"
<< " (or requires extension)";
}
} else if (env == SPV_ENV_OPENCL_1_2 || env == SPV_ENV_OPENCL_EMBEDDED_1_2) {
if (!IsSupportGuaranteedOpenCL_1_2(capability, opencl_embedded) &&
!IsSupportOptionalOpenCL_1_2(capability) &&
Expand Down
Loading