Module: Mesa
Branch: master
Commit: 53b13725717aaaa353cfdf1941ed3a2bcc01689c
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=53b13725717aaaa353cfdf1941ed3a2bcc01689c

Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
Date:   Tue Oct  8 22:14:44 2019 +0200

radv: Disallow sparse shared images.

Since we really cannot share them ever.

Also remove an unused switch.

Fixes: b70829708ac "radv: Implement VK_KHR_external_memory"
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>

---

 src/amd/vulkan/radv_formats.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index 98c84edbdc1..e68f7c9040f 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -1305,6 +1305,10 @@ get_external_image_format_properties(const 
VkPhysicalDeviceImageFormatInfo2 *pIm
        VkExternalMemoryFeatureFlagBits flags = 0;
        VkExternalMemoryHandleTypeFlags export_flags = 0;
        VkExternalMemoryHandleTypeFlags compat_flags = 0;
+
+       if (pImageFormatInfo->flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT)
+               return;
+
        switch (handleType) {
        case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
        case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
@@ -1381,14 +1385,9 @@ VkResult radv_GetPhysicalDeviceImageFormatProperties2(
         *    present and VkExternalImageFormatProperties will be ignored.
         */
        if (external_info && external_info->handleType != 0) {
-               switch (external_info->handleType) {
-               case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
-               case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
-               case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT:
-                       get_external_image_format_properties(base_info, 
external_info->handleType,
-                                                            
&external_props->externalMemoryProperties);
-                       break;
-               default:
+               get_external_image_format_properties(base_info, 
external_info->handleType,
+                                                    
&external_props->externalMemoryProperties);
+               if 
(!external_props->externalMemoryProperties.externalMemoryFeatures) {
                        /* From the Vulkan 1.0.97 spec:
                         *
                         *    If handleType is not compatible with the 
[parameters] specified

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to