<p dir="ltr">This is nice. Both are </p>
<p dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>></p>
<div class="gmail_extra"><br><div class="gmail_quote">On Oct 28, 2016 5:55 AM, "Eduardo Lima Mitev" <<a href="mailto:elima@igalia.com">elima@igalia.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This patch simplifies x11_surface_get_formats() and makes it more readable.<br>
It is actually an improvement over the patch I provided earlier this week<br>
(750d8cad72), which was not very "good-tasting". I'm sorry for the noise.<br>
---<br>
src/vulkan/wsi/wsi_common_x11.<wbr>c | 11 +++--------<br>
1 file changed, 3 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/src/vulkan/wsi/wsi_common_<wbr>x11.c b/src/vulkan/wsi/wsi_common_<wbr>x11.c<br>
index 4a232f5..8142847 100644<br>
--- a/src/vulkan/wsi/wsi_common_<wbr>x11.c<br>
+++ b/src/vulkan/wsi/wsi_common_<wbr>x11.c<br>
@@ -396,16 +396,11 @@ x11_surface_get_formats(<wbr>VkIcdSurfaceBase *surface,<br>
return VK_SUCCESS;<br>
}<br>
<br>
- VkResult result = VK_SUCCESS;<br>
-<br>
- if (*pSurfaceFormatCount > ARRAY_SIZE(formats))<br>
- *pSurfaceFormatCount = ARRAY_SIZE(formats);<br>
- else if (*pSurfaceFormatCount < ARRAY_SIZE(formats))<br>
- result = VK_INCOMPLETE;<br>
-<br>
+ *pSurfaceFormatCount = MIN2(*pSurfaceFormatCount, ARRAY_SIZE(formats));<br>
typed_memcpy(pSurfaceFormats, formats, *pSurfaceFormatCount);<br>
<br>
- return result;<br>
+ return *pSurfaceFormatCount < ARRAY_SIZE(formats) ?<br>
+ VK_INCOMPLETE : VK_SUCCESS;<br>
}<br>
<br>
static VkResult<br>
--<br>
2.8.1<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</blockquote></div></div>