On 14 July 2017 at 05:59, Louis-Francis Ratté-Boulianne
<l...@collabora.com> wrote:
> From: Daniel Stone <dani...@collabora.com>
>
> Adds support for multiple planes and buffer modifiers.
> ---
> src/intel/vulkan/anv_wsi.c | 7 +-
> src/vulkan/wsi/wsi_common_x11.c | 137
> ++++++++++++++++++++++++++++++++++++----
> 2 files changed, 131 insertions(+), 13 deletions(-)
>
> diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
> index 53ad7d153e..ca5611666e 100644
> --- a/src/intel/vulkan/anv_wsi.c
> +++ b/src/intel/vulkan/anv_wsi.c
> @@ -201,8 +201,11 @@ anv_wsi_image_create(VkDevice device_h,
> for (i = 0; i < num_modifiers; i++) {
> enum isl_tiling t;
> enum isl_aux_usage a;
> - if (isl_tiling_from_drm_format_mod(modifiers[i], &t, &a))
> + if (modifiers[i] != DRM_FORMAT_MOD_LINEAR &&
> + isl_tiling_from_drm_format_mod(modifiers[i], &t, &a)) {
> vk_tiling = VK_IMAGE_TILING_OPTIMAL;
> + break;
> + }
> }
>
> VkResult result;
> @@ -231,7 +234,7 @@ anv_wsi_image_create(VkDevice device_h,
> .pNext =
> &(VkExportImageDmaBufInfoMESAX) {
> .sType = VK_STRUCTURE_TYPE_EXPORT_IMAGE_DMA_BUF_INFO_MESAX,
> - .drmFormatModifierCount = ARRAY_SIZE(modifiers),
> + .drmFormatModifierCount = num_modifiers,
> .pDrmFormatModifiers = modifiers,
> }}},
> NULL,
I think these hunks belong to earlier patch(es).
-Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
