fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan/wsi/drm: Drop wsi_create_native/prime_image

Browse source 
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12031>
This commit is contained in:
Jason Ekstrand 2021-07-22 23:50:22 -05:00 • committed by Marge Bot
parent ed391d2a46
commit 1abab1a28f
2 changed files with 0 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/vulkan/wsi/wsi_common_drm.c
View file

@ -419,32 +419,6 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
return VK_SUCCESS;
}
VkResult
wsi_create_native_image(const struct wsi_swapchain *chain,
const VkSwapchainCreateInfoKHR *pCreateInfo,
uint32_t num_modifier_lists,
const uint32_t *num_modifiers,
const uint64_t *const *modifiers,
uint8_t *(alloc_shm)(struct wsi_image *image, unsigned size),
struct wsi_image *image)
{
VkResult result;
struct wsi_image_info info;
result = wsi_configure_native_image(chain, pCreateInfo,
num_modifier_lists,
num_modifiers, modifiers,
alloc_shm, &info);
if (result != VK_SUCCESS)
return result;
result = wsi_create_image(chain, &info, image);
wsi_destroy_image_info(chain, &info);
return result;
}
static inline uint32_t
align_u32(uint32_t v, uint32_t a)
{
@ -645,25 +619,3 @@ wsi_configure_prime_image(UNUSED const struct wsi_swapchain *chain,
return VK_SUCCESS;
}
VkResult
wsi_create_prime_image(const struct wsi_swapchain *chain,
const VkSwapchainCreateInfoKHR *pCreateInfo,
bool use_modifier,
struct wsi_image *image)
{
struct wsi_image_info info;
VkResult result = wsi_configure_prime_image(chain, pCreateInfo,
use_modifier, &info);
if (result != VK_SUCCESS)
return result;
result = wsi_create_image(chain, &info, image);
if (result != VK_SUCCESS) {
wsi_destroy_image_info(chain, &info);
return result;
}
return VK_SUCCESS;
}

13
src/vulkan/wsi/wsi_common_private.h
View file

@ -140,25 +140,12 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
uint8_t *(alloc_shm)(struct wsi_image *image,
unsigned size),
struct wsi_image_info *info);
VkResult
wsi_create_native_image(const struct wsi_swapchain *chain,
const VkSwapchainCreateInfoKHR *pCreateInfo,
uint32_t num_modifier_lists,
const uint32_t *num_modifiers,
const uint64_t *const *modifiers,
uint8_t *(alloc_shm)(struct wsi_image *image, unsigned size),
struct wsi_image *image);
VkResult
wsi_configure_prime_image(UNUSED const struct wsi_swapchain *chain,
const VkSwapchainCreateInfoKHR *pCreateInfo,
bool use_modifier,
struct wsi_image_info *info);
VkResult
wsi_create_prime_image(const struct wsi_swapchain *chain,
const VkSwapchainCreateInfoKHR *pCreateInfo,
bool use_modifier,
struct wsi_image *image);
VkResult
wsi_configure_image(const struct wsi_swapchain *chain,