diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2018-05-05 15:34:44 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2018-05-08 15:47:16 +0200 |
| commit | b17cfb08a3fc9a599eff64fffe48daba398a672f (patch) | |
| tree | 53513e8ab27ff905c2bbaa2745577a6296b76de6 /src/vulkan | |
| parent | a9e4be9212868f619ac492aaf86b0aa68d4395c4 (diff) | |
vulkan/wsi: Only use LINEAR modifier for prime if supported.
This was setting the LINEAR modifier if neither the
X server nor the driver supported modifiers.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106180
Fixes: c80c08e226 "vulkan/wsi/x11: Add support for DRI3 v1.2"
CC: 18.1 <mesa-stable@lists.freedesktop.org>
Tested-by: Abel Garcia Dorta <mercuriete@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/wsi/wsi_common.c | 3 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_private.h | 1 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_x11.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index fe262b4968..87e508ddf8 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -442,6 +442,7 @@ fail: VkResult wsi_create_prime_image(const struct wsi_swapchain *chain, const VkSwapchainCreateInfoKHR *pCreateInfo, + bool use_modifier, struct wsi_image *image) { const struct wsi_device *wsi = chain->wsi; @@ -626,7 +627,7 @@ wsi_create_prime_image(const struct wsi_swapchain *chain, if (result != VK_SUCCESS) goto fail; - image->drm_modifier = DRM_FORMAT_MOD_LINEAR; + image->drm_modifier = use_modifier ? DRM_FORMAT_MOD_LINEAR : DRM_FORMAT_MOD_INVALID; image->num_planes = 1; image->sizes[0] = linear_size; image->row_pitches[0] = linear_stride; diff --git a/src/vulkan/wsi/wsi_common_private.h b/src/vulkan/wsi/wsi_common_private.h index b608119b96..90941c8201 100644 --- a/src/vulkan/wsi/wsi_common_private.h +++ b/src/vulkan/wsi/wsi_common_private.h @@ -89,6 +89,7 @@ wsi_create_native_image(const struct wsi_swapchain *chain, VkResult wsi_create_prime_image(const struct wsi_swapchain *chain, const VkSwapchainCreateInfoKHR *pCreateInfo, + bool use_modifier, struct wsi_image *image); void diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index 3a00caddfb..62739b9912 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -1043,7 +1043,8 @@ x11_image_init(VkDevice device_h, struct x11_swapchain *chain, uint32_t bpp = 32; if (chain->base.use_prime_blit) { - result = wsi_create_prime_image(&chain->base, pCreateInfo, &image->base); + bool use_modifier = num_tranches > 0; + result = wsi_create_prime_image(&chain->base, pCreateInfo, use_modifier, &image->base); } else { result = wsi_create_native_image(&chain->base, pCreateInfo, num_tranches, num_modifiers, modifiers, |