fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 22:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wsi: Pass wsi_drm_image_params to wsi_configure_native_image

Browse source 
No need to split this out into function parameters, it's just less clean.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2023-10-11 13:55:21 +01:00
parent be4a6b946a
commit f17f43b149
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -309,9 +309,7 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain,
static VkResult static VkResult
wsi_configure_native_image(const struct wsi_swapchain *chain, wsi_configure_native_image(const struct wsi_swapchain *chain,
const VkSwapchainCreateInfoKHR *pCreateInfo, const VkSwapchainCreateInfoKHR *pCreateInfo,
uint32_t num_modifier_lists, const struct wsi_drm_image_params *params,
const uint32_t *num_modifiers,
const uint64_t *const *modifiers,
struct wsi_image_info *info) struct wsi_image_info *info)
{ {
const struct wsi_device *wsi = chain->wsi; const struct wsi_device *wsi = chain->wsi;
@ -323,7 +321,7 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
if (num_modifier_lists == 0) { if (params->num_modifier_lists == 0) {
/* If we don't have modifiers, fall back to the legacy "scanout" flag */ /* If we don't have modifiers, fall back to the legacy "scanout" flag */
info->wsi.scanout = true; info->wsi.scanout = true;
} else { } else {
@ -402,8 +400,8 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
} }
uint32_t max_modifier_count = 0; uint32_t max_modifier_count = 0;
for (uint32_t l = 0; l < num_modifier_lists; l++) for (uint32_t l = 0; l < params->num_modifier_lists; l++)
max_modifier_count = MAX2(max_modifier_count, num_modifiers[l]); max_modifier_count = MAX2(max_modifier_count, params->num_modifiers[l]);
uint64_t *image_modifiers = uint64_t *image_modifiers =
vk_alloc(&chain->alloc, sizeof(*image_modifiers) * max_modifier_count, vk_alloc(&chain->alloc, sizeof(*image_modifiers) * max_modifier_count,
@ -412,13 +410,13 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
goto fail_oom; goto fail_oom;
uint32_t image_modifier_count = 0; uint32_t image_modifier_count = 0;
for (uint32_t l = 0; l < num_modifier_lists; l++) { for (uint32_t l = 0; l < params->num_modifier_lists; l++) {
/* Walk the modifier lists and construct a list of supported /* Walk the modifier lists and construct a list of supported
* modifiers. * modifiers.
*/ */
for (uint32_t i = 0; i < num_modifiers[l]; i++) { for (uint32_t i = 0; i < params->num_modifiers[l]; i++) {
if (get_modifier_props(info, modifiers[l][i])) if (get_modifier_props(info, params->modifiers[l][i]))
image_modifiers[image_modifier_count++] = modifiers[l][i]; image_modifiers[image_modifier_count++] = params->modifiers[l][i];
} }
/* We only want to take the modifiers from the first list */ /* We only want to take the modifiers from the first list */
@ -641,9 +639,7 @@ wsi_drm_configure_image(const struct wsi_swapchain *chain,
select_buffer_memory_type, info); select_buffer_memory_type, info);
} else { } else {
return wsi_configure_native_image(chain, pCreateInfo, return wsi_configure_native_image(chain, pCreateInfo,
params->num_modifier_lists, params,
params->num_modifiers,
params->modifiers,
info); info);
} }
} }