[Mesa-dev] [PATCH] anv: Drop 'x11' prefix from non-X11 WSI funcs

[Jason Ekstrand]

Rb


On April 28, 2017 1:54:58 AM Chad Versace <chadversary at chromium.org> wrote:

> Drop it from x11_anv_wsi_image_create and x11_anv_wsi_image_free. The
> functions are used by Wayland WSI too.
> ---
>  src/intel/vulkan/anv_wsi.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
> index ba66ea6d461..0afedcffb01 100644
> --- a/src/intel/vulkan/anv_wsi.c
> +++ b/src/intel/vulkan/anv_wsi.c
> @@ -142,16 +142,16 @@ VkResult anv_GetPhysicalDeviceSurfacePresentModesKHR(
>
>
>  static VkResult
> -x11_anv_wsi_image_create(VkDevice device_h,
> -                         const VkSwapchainCreateInfoKHR *pCreateInfo,
> -                         const VkAllocationCallbacks* pAllocator,
> -                         bool different_gpu,
> -                         bool linear,
> -                         VkImage *image_p,
> -                         VkDeviceMemory *memory_p,
> -                         uint32_t *size,
> -                         uint32_t *offset,
> -                         uint32_t *row_pitch, int *fd_p)
> +anv_wsi_image_create(VkDevice device_h,
> +                     const VkSwapchainCreateInfoKHR *pCreateInfo,
> +                     const VkAllocationCallbacks* pAllocator,
> +                     bool different_gpu,
> +                     bool linear,
> +                     VkImage *image_p,
> +                     VkDeviceMemory *memory_p,
> +                     uint32_t *size,
> +                     uint32_t *offset,
> +                     uint32_t *row_pitch, int *fd_p)
>  {
>     struct anv_device *device = anv_device_from_handle(device_h);
>     VkImage image_h;
> @@ -248,10 +248,10 @@ fail_create_image:
>  }
>
>  static void
> -x11_anv_wsi_image_free(VkDevice device,
> -                       const VkAllocationCallbacks* pAllocator,
> -                       VkImage image_h,
> -                       VkDeviceMemory memory_h)
> +anv_wsi_image_free(VkDevice device,
> +                   const VkAllocationCallbacks* pAllocator,
> +                   VkImage image_h,
> +                   VkDeviceMemory memory_h)
>  {
>     anv_DestroyImage(device, image_h, pAllocator);
>
> @@ -259,8 +259,8 @@ x11_anv_wsi_image_free(VkDevice device,
>  }
>
>  static const struct wsi_image_fns anv_wsi_image_fns = {
> -   .create_wsi_image = x11_anv_wsi_image_create,
> -   .free_wsi_image = x11_anv_wsi_image_free,
> +   .create_wsi_image = anv_wsi_image_create,
> +   .free_wsi_image = anv_wsi_image_free,
>  };
>
>  VkResult anv_CreateSwapchainKHR(
> --
> 2.12.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev