From 971523410fd2235e13c617b6a1569f70486258d7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 14 Oct 2016 05:42:29 +0100 Subject: anv: move common wsi code to x11/wayland common files. Next task is to rename all the anv_ out of this, and move to a common location Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_wsi.h | 109 --------------------------------------------- 1 file changed, 109 deletions(-) delete mode 100644 src/intel/vulkan/anv_wsi.h (limited to 'src/intel/vulkan/anv_wsi.h') diff --git a/src/intel/vulkan/anv_wsi.h b/src/intel/vulkan/anv_wsi.h deleted file mode 100644 index b227c51100b..00000000000 --- a/src/intel/vulkan/anv_wsi.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright © 2015 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#ifndef ANV_WSI_H -#define ANV_WSI_H - -#include "anv_private.h" - -struct anv_swapchain; - -struct anv_wsi_image_fns { - VkResult (*create_wsi_image)(VkDevice device_h, - const VkSwapchainCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkImage *image_p, - VkDeviceMemory *memory_p, - uint32_t *size_p, - uint32_t *offset_p, - uint32_t *row_pitch_p, - int *fd_p); - void (*free_wsi_image)(VkDevice device, - const VkAllocationCallbacks *pAllocator, - VkImage image_h, - VkDeviceMemory memory_h); -}; - -struct anv_wsi_interface { - VkResult (*get_support)(VkIcdSurfaceBase *surface, - struct anv_wsi_device *wsi_device, - const VkAllocationCallbacks *alloc, - uint32_t queueFamilyIndex, - VkBool32* pSupported); - VkResult (*get_capabilities)(VkIcdSurfaceBase *surface, - VkSurfaceCapabilitiesKHR* pSurfaceCapabilities); - VkResult (*get_formats)(VkIcdSurfaceBase *surface, - struct anv_wsi_device *wsi_device, - uint32_t* pSurfaceFormatCount, - VkSurfaceFormatKHR* pSurfaceFormats); - VkResult (*get_present_modes)(VkIcdSurfaceBase *surface, - uint32_t* pPresentModeCount, - VkPresentModeKHR* pPresentModes); - VkResult (*create_swapchain)(VkIcdSurfaceBase *surface, - VkDevice device, - struct anv_wsi_device *wsi_device, - const VkSwapchainCreateInfoKHR* pCreateInfo, - const VkAllocationCallbacks* pAllocator, - const struct anv_wsi_image_fns *image_fns, - struct anv_swapchain **swapchain); -}; - -struct anv_swapchain { - - VkDevice device; - VkAllocationCallbacks alloc; - const struct anv_wsi_image_fns *image_fns; - VkFence fences[3]; - - VkResult (*destroy)(struct anv_swapchain *swapchain, - const VkAllocationCallbacks *pAllocator); - VkResult (*get_images)(struct anv_swapchain *swapchain, - uint32_t *pCount, VkImage *pSwapchainImages); - VkResult (*acquire_next_image)(struct anv_swapchain *swap_chain, - uint64_t timeout, VkSemaphore semaphore, - uint32_t *image_index); - VkResult (*queue_present)(struct anv_swapchain *swap_chain, - uint32_t image_index); -}; - -ANV_DEFINE_NONDISP_HANDLE_CASTS(_VkIcdSurfaceBase, VkSurfaceKHR) -ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_swapchain, VkSwapchainKHR) - -struct anv_wsi_callbacks { - void (*get_phys_device_format_properties)(VkPhysicalDevice physicalDevice, - VkFormat format, - VkFormatProperties *pFormatProperties); -}; - -VkResult anv_x11_init_wsi(struct anv_wsi_device *wsi_device, - const VkAllocationCallbacks *alloc); -void anv_x11_finish_wsi(struct anv_wsi_device *wsi_device, - const VkAllocationCallbacks *alloc); - -VkResult anv_wl_init_wsi(struct anv_wsi_device *wsi_device, - const VkAllocationCallbacks *alloc, - VkPhysicalDevice physical_device, - const struct anv_wsi_callbacks *cbs); -void anv_wl_finish_wsi(struct anv_wsi_device *wsi_device, - const VkAllocationCallbacks *alloc); -#endif /* ANV_WSI_H */ -- cgit v1.2.3