From: Eduardo Lima Mitev <elima@igalia.com>
Date: Fri, 28 Oct 2016 12:45:36 +0000 (+0200)
Subject: vulkan/wsi/x11: Smplify implementation of vkGetPhysicalDeviceSurfaceFormatsKHR
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=129da274261b6e79f459e24428591f137bf92ed1;p=mesa.git

vulkan/wsi/x11: Smplify implementation of vkGetPhysicalDeviceSurfaceFormatsKHR

This patch simplifies x11_surface_get_formats(). It is actually just a
readability improvement over the patch I provided earlier this week
(750d8cad72).

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 4a232f5213b..814284799f6 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -396,16 +396,11 @@ x11_surface_get_formats(VkIcdSurfaceBase *surface,
       return VK_SUCCESS;
    }
 
-   VkResult result = VK_SUCCESS;
-
-   if (*pSurfaceFormatCount > ARRAY_SIZE(formats))
-      *pSurfaceFormatCount = ARRAY_SIZE(formats);
-   else if (*pSurfaceFormatCount < ARRAY_SIZE(formats))
-      result = VK_INCOMPLETE;
-
+   *pSurfaceFormatCount = MIN2(*pSurfaceFormatCount, ARRAY_SIZE(formats));
    typed_memcpy(pSurfaceFormats, formats, *pSurfaceFormatCount);
 
-   return result;
+   return *pSurfaceFormatCount < ARRAY_SIZE(formats) ?
+      VK_INCOMPLETE : VK_SUCCESS;
 }
 
 static VkResult