Skip to content

S
swiftshader
Commit 023914a2 by Sean Risser Committed by swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com
Options

Add all Vulkan 1.2 feature structs

Vulkan 1.2 requires that all implementations support all structs made core by the extension. Tests: dEQP-VK.api.info.get_physical_device_properties2.features Bug: b/181875303 Change-Id: Ib9f307778f77c135bb7415231f7b152b2ea5b06a Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/53388 Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarSean Risser <srisser@google.com> Commit-Queue: Nicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent bbda0c17
Showing with 39 additions and 8 deletions
src/Vulkan/VkPhysicalDevice.cpp
...@@ -249,6 +249,7 @@ static void getPhysicalDeviceDescriptorIndexingFeatures(T *features) ...@@ -249,6 +249,7 @@ static void getPhysicalDeviceDescriptorIndexingFeatures(T *features)
features->shaderInputAttachmentArrayDynamicIndexing = VK_FALSE; features->shaderInputAttachmentArrayDynamicIndexing = VK_FALSE;
features->shaderUniformTexelBufferArrayDynamicIndexing = VK_FALSE; features->shaderUniformTexelBufferArrayDynamicIndexing = VK_FALSE;
features->shaderStorageTexelBufferArrayDynamicIndexing = VK_FALSE; features->shaderStorageTexelBufferArrayDynamicIndexing = VK_FALSE;
features->shaderUniformBufferArrayNonUniformIndexing = VK_FALSE;
features->shaderSampledImageArrayNonUniformIndexing = VK_FALSE; features->shaderSampledImageArrayNonUniformIndexing = VK_FALSE;
features->shaderStorageBufferArrayNonUniformIndexing = VK_FALSE; features->shaderStorageBufferArrayNonUniformIndexing = VK_FALSE;
features->shaderStorageImageArrayNonUniformIndexing = VK_FALSE; features->shaderStorageImageArrayNonUniformIndexing = VK_FALSE;
...@@ -260,7 +261,7 @@ static void getPhysicalDeviceDescriptorIndexingFeatures(T *features) ...@@ -260,7 +261,7 @@ static void getPhysicalDeviceDescriptorIndexingFeatures(T *features)
features->descriptorBindingStorageImageUpdateAfterBind = VK_FALSE; features->descriptorBindingStorageImageUpdateAfterBind = VK_FALSE;
features->descriptorBindingStorageBufferUpdateAfterBind = VK_FALSE; features->descriptorBindingStorageBufferUpdateAfterBind = VK_FALSE;
features->descriptorBindingUniformTexelBufferUpdateAfterBind = VK_FALSE; features->descriptorBindingUniformTexelBufferUpdateAfterBind = VK_FALSE;
features->descriptorBindingStorageBufferUpdateAfterBind = VK_FALSE; features->descriptorBindingStorageTexelBufferUpdateAfterBind = VK_FALSE;
features->descriptorBindingUpdateUnusedWhilePending = VK_FALSE; features->descriptorBindingUpdateUnusedWhilePending = VK_FALSE;
features->descriptorBindingPartiallyBound = VK_FALSE; features->descriptorBindingPartiallyBound = VK_FALSE;
features->descriptorBindingVariableDescriptorCount = VK_FALSE; features->descriptorBindingVariableDescriptorCount = VK_FALSE;
...@@ -282,15 +283,35 @@ static void getPhysicalDeviceTimelineSemaphoreFeatures(T *features) ...@@ -282,15 +283,35 @@ static void getPhysicalDeviceTimelineSemaphoreFeatures(T *features)
} }
template<typename T> template<typename T>
static void getPhysicalDeviceVulkan12Features(T *features) static void getPhysicalDeviceShaderAtomicInt64Features(T *features)
{ {
features->samplerMirrorClampToEdge = VK_FALSE;
features->drawIndirectCount = VK_FALSE;
getPhysicalDevice8BitStorageFeaturesKHR(features);
features->shaderBufferInt64Atomics = VK_FALSE; features->shaderBufferInt64Atomics = VK_FALSE;
features->shaderSharedInt64Atomics = VK_FALSE; features->shaderSharedInt64Atomics = VK_FALSE;
}
template<typename T>
static void getPhysicalDeviceShaderFloat16Int8Features(T *features)
{
features->shaderFloat16 = VK_FALSE; features->shaderFloat16 = VK_FALSE;
features->shaderInt8 = VK_FALSE; features->shaderInt8 = VK_FALSE;
}
template<typename T>
static void getPhysicalDeviceBufferDeviceAddressFeatures(T *features)
{
features->bufferDeviceAddress = VK_FALSE;
features->bufferDeviceAddressCaptureReplay = VK_FALSE;
features->bufferDeviceAddressMultiDevice = VK_FALSE;
}
template<typename T>
static void getPhysicalDeviceVulkan12Features(T *features)
{
features->samplerMirrorClampToEdge = VK_FALSE;
features->drawIndirectCount = VK_FALSE;
getPhysicalDevice8BitStorageFeaturesKHR(features);
getPhysicalDeviceShaderAtomicInt64Features(features);
getPhysicalDeviceShaderFloat16Int8Features(features);
features->descriptorIndexing = VK_FALSE; features->descriptorIndexing = VK_FALSE;
getPhysicalDeviceDescriptorIndexingFeatures(features); getPhysicalDeviceDescriptorIndexingFeatures(features);
features->samplerFilterMinmax = VK_FALSE; features->samplerFilterMinmax = VK_FALSE;
...@@ -301,9 +322,7 @@ static void getPhysicalDeviceVulkan12Features(T *features) ...@@ -301,9 +322,7 @@ static void getPhysicalDeviceVulkan12Features(T *features)
getPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR(features); getPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR(features);
getPhysicalDeviceHostQueryResetFeatures(features); getPhysicalDeviceHostQueryResetFeatures(features);
getPhysicalDeviceTimelineSemaphoreFeatures(features); getPhysicalDeviceTimelineSemaphoreFeatures(features);
features->bufferDeviceAddress = VK_FALSE; getPhysicalDeviceBufferDeviceAddressFeatures(features);
features->bufferDeviceAddressCaptureReplay = VK_FALSE;
features->bufferDeviceAddressMultiDevice = VK_FALSE;
getPhysicalDeviceVulkanMemoryModelFeatures(features); getPhysicalDeviceVulkanMemoryModelFeatures(features);
features->shaderOutputViewportIndex = VK_FALSE; features->shaderOutputViewportIndex = VK_FALSE;
features->shaderOutputLayer = VK_FALSE; features->shaderOutputLayer = VK_FALSE;
...@@ -384,6 +403,18 @@ void PhysicalDevice::getFeatures2(VkPhysicalDeviceFeatures2 *features) const ...@@ -384,6 +403,18 @@ void PhysicalDevice::getFeatures2(VkPhysicalDeviceFeatures2 *features) const
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES:
getPhysicalDeviceTimelineSemaphoreFeatures(reinterpret_cast<VkPhysicalDeviceTimelineSemaphoreFeatures *>(curExtension)); getPhysicalDeviceTimelineSemaphoreFeatures(reinterpret_cast<VkPhysicalDeviceTimelineSemaphoreFeatures *>(curExtension));
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES:
getPhysicalDeviceShaderAtomicInt64Features(reinterpret_cast<VkPhysicalDeviceShaderAtomicInt64Features *>(curExtension));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES:
getPhysicalDeviceShaderFloat16Int8Features(reinterpret_cast<VkPhysicalDeviceShaderFloat16Int8Features *>(curExtension));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES:
getPhysicalDeviceBufferDeviceAddressFeatures(reinterpret_cast<VkPhysicalDeviceBufferDeviceAddressFeatures *>(curExtension));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES:
getPhysicalDeviceDescriptorIndexingFeatures(reinterpret_cast<VkPhysicalDeviceDescriptorIndexingFeatures *>(curExtension));
break;
default: default:
LOG_TRAP("curExtension->pNext->sType = %s", vk::Stringify(curExtension->sType).c_str()); LOG_TRAP("curExtension->pNext->sType = %s", vk::Stringify(curExtension->sType).c_str());
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment