vulkan: fix build issue on android (both anv/radv)

Fixes linking errors against:

   anv_GetPhysicalDeviceImageFormatProperties2KHR
   radv_GetPhysicalDeviceImageFormatProperties2KHR

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c
index 09da601dac9b3c2510112c0176095ed777086ea7..c06c83b8ab4415648bcfcc8f05d67a62834af7c8 100644 (file)
--- a/src/amd/vulkan/radv_android.c
+++ b/src/amd/vulkan/radv_android.c
@@ -230,11 +230,11 @@ VkResult radv_GetSwapchainGrallocUsageANDROID(
        };
 
        /* Check that requested format and usage are supported. */
-       result = radv_GetPhysicalDeviceImageFormatProperties2KHR(phys_dev_h,
-                                                                &image_format_info, &image_format_props);
+       result = radv_GetPhysicalDeviceImageFormatProperties2(phys_dev_h,
+                                                             &image_format_info, &image_format_props);
        if (result != VK_SUCCESS) {
                return vk_errorf(result,
-                                "radv_GetPhysicalDeviceImageFormatProperties2KHR failed "
+                                "radv_GetPhysicalDeviceImageFormatProperties2 failed "
                                 "inside %s", __func__);
        }
 

diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c
index b1bbbb6829064bd467875132f080e2ee71fd9af8..7e07dbaaa45ab9321c1fb40dbff03f58d198a9b5 100644 (file)
--- a/src/intel/vulkan/anv_android.c
+++ b/src/intel/vulkan/anv_android.c
@@ -254,11 +254,11 @@ VkResult anv_GetSwapchainGrallocUsageANDROID(
    };
 
    /* Check that requested format and usage are supported. */
-   result = anv_GetPhysicalDeviceImageFormatProperties2KHR(phys_dev_h,
+   result = anv_GetPhysicalDeviceImageFormatProperties2(phys_dev_h,
                &image_format_info, &image_format_props);
    if (result != VK_SUCCESS) {
       return vk_errorf(device->instance, device, result,
-                       "anv_GetPhysicalDeviceImageFormatProperties2KHR failed "
+                       "anv_GetPhysicalDeviceImageFormatProperties2 failed "
                        "inside %s", __func__);
    }