Attachment 124873 Details for Bug 96791 – anv: wsi: create swapchain images using specified image usage

[patch] anv: wsi: create swapchain images using specified image usage

0001-anv-wsi-create-swapchain-images-using-specified-imag.patch (text/plain), 2.87 KB, created by Lionel Landwerlin on 2016-07-03 18:28:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lionel Landwerlin

Created: 2016-07-03 18:28:02 UTC

Size: 2.87 KB

patch

obsolete

>From cb4f6586f53557f16bf1c21c2279fc5c2170c2af Mon Sep 17 00:00:00 2001
>From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>Date: Sun, 3 Jul 2016 15:52:09 +0100
>Subject: [PATCH] anv: wsi: create swapchain images using specified image usage
>
>The image usage specified by the caller of vkCreateSwapchainKHR should be
>passed onto the internal image creation. Otherwise the driver might later
>crash when the user tries to use the image as a combined sampler even though
>the creation was explicitly created with VK_IMAGE_USAGE_TRANSFER_SRC_BIT.
>
>Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>---
> src/intel/vulkan/anv_wsi_wayland.c | 10 +++++++---
> src/intel/vulkan/anv_wsi_x11.c     |  3 ++-
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/src/intel/vulkan/anv_wsi_wayland.c b/src/intel/vulkan/anv_wsi_wayland.c
>index e95359c..a9e1617 100644
>--- a/src/intel/vulkan/anv_wsi_wayland.c
>+++ b/src/intel/vulkan/anv_wsi_wayland.c
>@@ -607,7 +607,9 @@ static const struct wl_buffer_listener buffer_listener = {
> };
> 
> static VkResult
>-wsi_wl_image_init(struct wsi_wl_swapchain *chain, struct wsi_wl_image *image,
>+wsi_wl_image_init(struct wsi_wl_swapchain *chain,
>+                  struct wsi_wl_image *image,
>+                  const VkSwapchainCreateInfoKHR *pCreateInfo,
>                   const VkAllocationCallbacks* pAllocator)
> {
>    VkDevice vk_device = anv_device_to_handle(chain->base.device);
>@@ -633,7 +635,8 @@ wsi_wl_image_init(struct wsi_wl_swapchain *chain, struct wsi_wl_image *image,
>          .samples = 1,
>          /* FIXME: Need a way to use X tiling to allow scanout */
>          .tiling = VK_IMAGE_TILING_OPTIMAL,
>-         .usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
>+         .usage = (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
>+                   pCreateInfo->imageUsage),
>          .flags = 0,
>       }},
>       pAllocator,
>@@ -794,7 +797,8 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
>    }
> 
>    for (uint32_t i = 0; i < chain->image_count; i++) {
>-      result = wsi_wl_image_init(chain, &chain->images[i], pAllocator);
>+      result = wsi_wl_image_init(chain, &chain->images[i],
>+                                 pCreateInfo, pAllocator);
>       if (result != VK_SUCCESS)
>          goto fail;
>       chain->images[i].busy = false;
>diff --git a/src/intel/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c
>index d1e23a6..2895d6b 100644
>--- a/src/intel/vulkan/anv_wsi_x11.c
>+++ b/src/intel/vulkan/anv_wsi_x11.c
>@@ -606,7 +606,8 @@ x11_image_init(struct anv_device *device, struct x11_swapchain *chain,
>          .samples = 1,
>          /* FIXME: Need a way to use X tiling to allow scanout */
>          .tiling = VK_IMAGE_TILING_OPTIMAL,
>-         .usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
>+         .usage = (pCreateInfo->imageUsage |
>+                   VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT),
>          .flags = 0,
>       }},
>       NULL,
>-- 
>2.8.1
>

Actions: View | Splinter Review

Attachments on bug 96791: 124873

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.