Module: Mesa
Branch: master
Commit: 129da274261b6e79f459e24428591f137bf92ed1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=129da274261b6e79f459e24428591f137bf92ed1
Author: Eduardo Lima Mitev <el...@igalia.com>
Date: Fri Oct 28 14:45:36 2016 +0200
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.engest...@imgtec.com>
---
src/vulkan/wsi/wsi_common_x11.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 4a232f5..8142847 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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
