X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fvulkan%2Fanv_wsi.c;h=20094f93e1f066866f5470e2056bc57713002969;hb=68df93ecbcee6215ac49e0c6f62ae818d2bc9962;hp=e15d1a3e073cc138b65e82dec6f43dabdbecdac2;hpb=1ae6ece9802e77ede97722c0f7cdd0c24e6fbd04;p=mesa.git diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index e15d1a3e073..20094f93e1f 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -21,30 +21,39 @@ * IN THE SOFTWARE. */ -#include "anv_wsi.h" +#include "anv_private.h" +#include "wsi_common.h" +#include "vk_format_info.h" +#include "vk_util.h" + +static PFN_vkVoidFunction +anv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) +{ + ANV_FROM_HANDLE(anv_physical_device, physical_device, physicalDevice); + return anv_lookup_entrypoint(&physical_device->info, pName); +} + +static uint64_t +anv_wsi_image_get_modifier(VkImage _image) +{ + ANV_FROM_HANDLE(anv_image, image, _image); + return image->drm_format_mod; +} VkResult anv_init_wsi(struct anv_physical_device *physical_device) { VkResult result; - memset(physical_device->wsi, 0, sizeof(physical_device->wsi)); - -#ifdef VK_USE_PLATFORM_XCB_KHR - result = anv_x11_init_wsi(physical_device); + result = wsi_device_init(&physical_device->wsi_device, + anv_physical_device_to_handle(physical_device), + anv_wsi_proc_addr, + &physical_device->instance->alloc); if (result != VK_SUCCESS) return result; -#endif - -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - result = anv_wl_init_wsi(physical_device); - if (result != VK_SUCCESS) { -#ifdef VK_USE_PLATFORM_XCB_KHR - anv_x11_finish_wsi(physical_device); -#endif - return result; - } -#endif + + physical_device->wsi_device.supports_modifiers = true; + physical_device->wsi_device.image_get_modifier = anv_wsi_image_get_modifier; return VK_SUCCESS; } @@ -52,12 +61,8 @@ anv_init_wsi(struct anv_physical_device *physical_device) void anv_finish_wsi(struct anv_physical_device *physical_device) { -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - anv_wl_finish_wsi(physical_device); -#endif -#ifdef VK_USE_PLATFORM_XCB_KHR - anv_x11_finish_wsi(physical_device); -#endif + wsi_device_finish(&physical_device->wsi_device, + &physical_device->instance->alloc); } void anv_DestroySurfaceKHR( @@ -66,7 +71,10 @@ void anv_DestroySurfaceKHR( const VkAllocationCallbacks* pAllocator) { ANV_FROM_HANDLE(anv_instance, instance, _instance); - ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); + ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface); + + if (!surface) + return; vk_free2(&instance->alloc, pAllocator, surface); } @@ -74,54 +82,78 @@ void anv_DestroySurfaceKHR( VkResult anv_GetPhysicalDeviceSurfaceSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, VkBool32* pSupported) { ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); - ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct anv_wsi_interface *iface = device->wsi[surface->platform]; - return iface->get_support(surface, device, queueFamilyIndex, pSupported); + return wsi_common_get_surface_support(&device->wsi_device, + device->local_fd, + queueFamilyIndex, + surface, + &device->instance->alloc, + pSupported); } VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR( VkPhysicalDevice physicalDevice, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) { ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); - ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct anv_wsi_interface *iface = device->wsi[surface->platform]; - return iface->get_capabilities(surface, device, pSurfaceCapabilities); + return wsi_common_get_surface_capabilities(&device->wsi_device, + surface, + pSurfaceCapabilities); +} + +VkResult anv_GetPhysicalDeviceSurfaceCapabilities2KHR( + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, + VkSurfaceCapabilities2KHR* pSurfaceCapabilities) +{ + ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); + + return wsi_common_get_surface_capabilities2(&device->wsi_device, + pSurfaceInfo, + pSurfaceCapabilities); } VkResult anv_GetPhysicalDeviceSurfaceFormatsKHR( VkPhysicalDevice physicalDevice, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) { ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); - ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct anv_wsi_interface *iface = device->wsi[surface->platform]; - return iface->get_formats(surface, device, pSurfaceFormatCount, - pSurfaceFormats); + return wsi_common_get_surface_formats(&device->wsi_device, surface, + pSurfaceFormatCount, pSurfaceFormats); +} + +VkResult anv_GetPhysicalDeviceSurfaceFormats2KHR( + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, + uint32_t* pSurfaceFormatCount, + VkSurfaceFormat2KHR* pSurfaceFormats) +{ + ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); + + return wsi_common_get_surface_formats2(&device->wsi_device, pSurfaceInfo, + pSurfaceFormatCount, pSurfaceFormats); } VkResult anv_GetPhysicalDeviceSurfacePresentModesKHR( VkPhysicalDevice physicalDevice, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) { ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); - ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct anv_wsi_interface *iface = device->wsi[surface->platform]; - return iface->get_present_modes(surface, device, pPresentModeCount, - pPresentModes); + return wsi_common_get_surface_present_modes(&device->wsi_device, surface, + pPresentModeCount, + pPresentModes); } VkResult anv_CreateSwapchainKHR( @@ -131,68 +163,70 @@ VkResult anv_CreateSwapchainKHR( VkSwapchainKHR* pSwapchain) { ANV_FROM_HANDLE(anv_device, device, _device); - ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, pCreateInfo->surface); - struct anv_wsi_interface *iface = - device->instance->physicalDevice.wsi[surface->platform]; - struct anv_swapchain *swapchain; - - VkResult result = iface->create_swapchain(surface, device, pCreateInfo, - pAllocator, &swapchain); - if (result != VK_SUCCESS) - return result; + struct wsi_device *wsi_device = &device->instance->physicalDevice.wsi_device; + const VkAllocationCallbacks *alloc; if (pAllocator) - swapchain->alloc = *pAllocator; + alloc = pAllocator; else - swapchain->alloc = device->alloc; - - for (unsigned i = 0; i < ARRAY_SIZE(swapchain->fences); i++) - swapchain->fences[i] = VK_NULL_HANDLE; + alloc = &device->alloc; - *pSwapchain = anv_swapchain_to_handle(swapchain); - - return VK_SUCCESS; + return wsi_common_create_swapchain(wsi_device, _device, device->fd, + pCreateInfo, alloc, pSwapchain); } void anv_DestroySwapchainKHR( - VkDevice device, - VkSwapchainKHR _swapchain, + VkDevice _device, + VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator) { - ANV_FROM_HANDLE(anv_swapchain, swapchain, _swapchain); + ANV_FROM_HANDLE(anv_device, device, _device); + const VkAllocationCallbacks *alloc; - for (unsigned i = 0; i < ARRAY_SIZE(swapchain->fences); i++) { - if (swapchain->fences[i] != VK_NULL_HANDLE) - anv_DestroyFence(device, swapchain->fences[i], pAllocator); - } + if (pAllocator) + alloc = pAllocator; + else + alloc = &device->alloc; - swapchain->destroy(swapchain, pAllocator); + wsi_common_destroy_swapchain(_device, swapchain, alloc); } VkResult anv_GetSwapchainImagesKHR( VkDevice device, - VkSwapchainKHR _swapchain, + VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages) { - ANV_FROM_HANDLE(anv_swapchain, swapchain, _swapchain); - - return swapchain->get_images(swapchain, pSwapchainImageCount, + return wsi_common_get_images(swapchain, + pSwapchainImageCount, pSwapchainImages); } VkResult anv_AcquireNextImageKHR( - VkDevice device, - VkSwapchainKHR _swapchain, + VkDevice _device, + VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex) { - ANV_FROM_HANDLE(anv_swapchain, swapchain, _swapchain); - - return swapchain->acquire_next_image(swapchain, timeout, semaphore, - pImageIndex); + ANV_FROM_HANDLE(anv_device, device, _device); + struct anv_physical_device *pdevice = &device->instance->physicalDevice; + + VkResult result = wsi_common_acquire_next_image(&pdevice->wsi_device, + _device, + swapchain, + timeout, + semaphore, + pImageIndex); + + /* Thanks to implicit sync, the image is ready immediately. However, we + * should wait for the current GPU state to finish. + */ + if (fence != VK_NULL_HANDLE) + anv_QueueSubmit(anv_queue_to_handle(&device->queue), 0, NULL, fence); + + return result; } VkResult anv_QueuePresentKHR( @@ -200,44 +234,33 @@ VkResult anv_QueuePresentKHR( const VkPresentInfoKHR* pPresentInfo) { ANV_FROM_HANDLE(anv_queue, queue, _queue); - VkResult result; + struct anv_physical_device *pdevice = + &queue->device->instance->physicalDevice; + + return wsi_common_queue_present(&pdevice->wsi_device, + anv_device_to_handle(queue->device), + _queue, 0, + pPresentInfo); +} - for (uint32_t i = 0; i < pPresentInfo->swapchainCount; i++) { - ANV_FROM_HANDLE(anv_swapchain, swapchain, pPresentInfo->pSwapchains[i]); - - assert(swapchain->device == queue->device); - - if (swapchain->fences[0] == VK_NULL_HANDLE) { - result = anv_CreateFence(anv_device_to_handle(queue->device), - &(VkFenceCreateInfo) { - .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - .flags = 0, - }, &swapchain->alloc, &swapchain->fences[0]); - if (result != VK_SUCCESS) - return result; - } else { - anv_ResetFences(anv_device_to_handle(queue->device), - 1, &swapchain->fences[0]); - } - - anv_QueueSubmit(_queue, 0, NULL, swapchain->fences[0]); - - result = swapchain->queue_present(swapchain, queue, - pPresentInfo->pImageIndices[i]); - /* TODO: What if one of them returns OUT_OF_DATE? */ - if (result != VK_SUCCESS) - return result; - - VkFence last = swapchain->fences[2]; - swapchain->fences[2] = swapchain->fences[1]; - swapchain->fences[1] = swapchain->fences[0]; - swapchain->fences[0] = last; - - if (last != VK_NULL_HANDLE) { - anv_WaitForFences(anv_device_to_handle(queue->device), - 1, &last, true, 1); - } - } +VkResult anv_GetDeviceGroupPresentCapabilitiesKHR( + VkDevice device, + VkDeviceGroupPresentCapabilitiesKHR* pCapabilities) +{ + memset(pCapabilities->presentMask, 0, + sizeof(pCapabilities->presentMask)); + pCapabilities->presentMask[0] = 0x1; + pCapabilities->modes = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR; + + return VK_SUCCESS; +} + +VkResult anv_GetDeviceGroupSurfacePresentModesKHR( + VkDevice device, + VkSurfaceKHR surface, + VkDeviceGroupPresentModeFlagsKHR* pModes) +{ + *pModes = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR; return VK_SUCCESS; }