diff options
| author | Nicolas Capens <capn@google.com> | 2022-04-20 11:34:59 -0400 |
|---|---|---|
| committer | Nicolas Capens <nicolascapens@google.com> | 2022-04-20 18:50:15 +0000 |
| commit | 71f3089b729c0bd3383905ae43080af1e7946e40 (patch) | |
| tree | 5459096c25987d9d44ae0e52a8a3d1d4a3ab6bd7 | |
| parent | 697c5be0d75c08829020078cc9985f01ec83a5ee (diff) | |
| download | swiftshader-71f3089b729c0bd3383905ae43080af1e7946e40.tar.gz | |
Revert "Temporarily ignore unsupported feature struct"
This reverts commit d621b4de4cd146481060904af00ec54cda557205.
Bug: b/228307968
Change-Id: Ie5e218de32957a7a1059fb7f4e91a71bb7ca4ac3
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/65208
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
| -rw-r--r-- | src/Vulkan/VkPhysicalDevice.cpp | 3 | ||||
| -rw-r--r-- | src/Vulkan/libVulkan.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp index 5817d13ad..5369175d4 100644 --- a/src/Vulkan/VkPhysicalDevice.cpp +++ b/src/Vulkan/VkPhysicalDevice.cpp @@ -579,9 +579,6 @@ void PhysicalDevice::getFeatures2(VkPhysicalDeviceFeatures2 *features) const case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES: getPhysicalDeviceMaintenance4Features(reinterpret_cast<struct VkPhysicalDeviceMaintenance4Features *>(curExtension)); break; - // FIXME(b/228307968): dEQP mistakenly considers VK_EXT_shader_image_atomic_int64 promoted to Vulkan 1.2 (https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3631) - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT: - break; case VK_STRUCTURE_TYPE_MAX_ENUM: // TODO(b/176893525): This may not be legal. dEQP tests that this value is ignored. break; // FIXME(b/228307968): VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp index 169f10584..5cee79caa 100644 --- a/src/Vulkan/libVulkan.cpp +++ b/src/Vulkan/libVulkan.cpp @@ -1065,9 +1065,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(VkPhysicalDevice physicalDevice, c case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES: case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES: break; - // FIXME(b/228307968): dEQP mistakenly considers VK_EXT_shader_image_atomic_int64 promoted to Vulkan 1.2 (https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3631) - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT: - break; default: // "the [driver] must skip over, without processing (other than reading the sType and pNext members) any structures in the chain with sType values not defined by [supported extenions]" UNSUPPORTED("pCreateInfo->pNext sType = %s", vk::Stringify(extensionCreateInfo->sType).c_str()); |