X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_wsi.c;h=e016e8371029fd4144175b9650392e20c35ddf82;hb=70b5e85fc3a79214b4f25db0e6d8fcc32d62a2f1;hp=5922d6ab8b7539234ce71c67a57549829a01c3f8;hpb=f4e499ec79147f4172f3669ae9dafd941aaeeb65;p=mesa.git diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index 5922d6ab8b7..e016e837102 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -23,44 +23,32 @@ * IN THE SOFTWARE. */ -#include "radv_wsi.h" - +#include "radv_private.h" +#include "radv_meta.h" +#include "wsi_common.h" +#include "vk_util.h" +#include "util/macros.h" + +static PFN_vkVoidFunction +radv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) +{ + return radv_lookup_entrypoint(pName); +} VkResult radv_init_wsi(struct radv_physical_device *physical_device) { - VkResult result; - - memset(physical_device->wsi, 0, sizeof(physical_device->wsi)); - -#ifdef VK_USE_PLATFORM_XCB_KHR - result = radv_x11_init_wsi(physical_device); - if (result != VK_SUCCESS) - return result; -#endif - -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - result = radv_wl_init_wsi(physical_device); - if (result != VK_SUCCESS) { -#ifdef VK_USE_PLATFORM_XCB_KHR - radv_x11_finish_wsi(physical_device); -#endif - return result; - } -#endif - - return VK_SUCCESS; + return wsi_device_init(&physical_device->wsi_device, + radv_physical_device_to_handle(physical_device), + radv_wsi_proc_addr, + &physical_device->instance->alloc); } void radv_finish_wsi(struct radv_physical_device *physical_device) { -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - radv_wl_finish_wsi(physical_device); -#endif -#ifdef VK_USE_PLATFORM_XCB_KHR - radv_x11_finish_wsi(physical_device); -#endif + wsi_device_finish(&physical_device->wsi_device, + &physical_device->instance->alloc); } void radv_DestroySurfaceKHR( @@ -69,62 +57,91 @@ void radv_DestroySurfaceKHR( const VkAllocationCallbacks* pAllocator) { RADV_FROM_HANDLE(radv_instance, instance, _instance); - RADV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); + ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface); - radv_free2(&instance->alloc, pAllocator, surface); + vk_free2(&instance->alloc, pAllocator, surface); } VkResult radv_GetPhysicalDeviceSurfaceSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, VkBool32* pSupported) { RADV_FROM_HANDLE(radv_physical_device, device, physicalDevice); - RADV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct radv_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 radv_GetPhysicalDeviceSurfaceCapabilitiesKHR( VkPhysicalDevice physicalDevice, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) { RADV_FROM_HANDLE(radv_physical_device, device, physicalDevice); - RADV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct radv_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 radv_GetPhysicalDeviceSurfaceCapabilities2KHR( + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, + VkSurfaceCapabilities2KHR* pSurfaceCapabilities) +{ + RADV_FROM_HANDLE(radv_physical_device, device, physicalDevice); + + return wsi_common_get_surface_capabilities2(&device->wsi_device, + pSurfaceInfo, + pSurfaceCapabilities); } VkResult radv_GetPhysicalDeviceSurfaceFormatsKHR( VkPhysicalDevice physicalDevice, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) { RADV_FROM_HANDLE(radv_physical_device, device, physicalDevice); - RADV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct radv_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 radv_GetPhysicalDeviceSurfaceFormats2KHR( + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, + uint32_t* pSurfaceFormatCount, + VkSurfaceFormat2KHR* pSurfaceFormats) +{ + RADV_FROM_HANDLE(radv_physical_device, device, physicalDevice); + + return wsi_common_get_surface_formats2(&device->wsi_device, + pSurfaceInfo, + pSurfaceFormatCount, + pSurfaceFormats); } VkResult radv_GetPhysicalDeviceSurfacePresentModesKHR( VkPhysicalDevice physicalDevice, - VkSurfaceKHR _surface, + VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) { RADV_FROM_HANDLE(radv_physical_device, device, physicalDevice); - RADV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); - struct radv_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 radv_CreateSwapchainKHR( @@ -134,68 +151,76 @@ VkResult radv_CreateSwapchainKHR( VkSwapchainKHR* pSwapchain) { RADV_FROM_HANDLE(radv_device, device, _device); - RADV_FROM_HANDLE(_VkIcdSurfaceBase, surface, pCreateInfo->surface); - struct radv_wsi_interface *iface = - device->instance->physicalDevice.wsi[surface->platform]; - struct radv_swapchain *swapchain; - - VkResult result = iface->create_swapchain(surface, device, pCreateInfo, - pAllocator, &swapchain); - if (result != VK_SUCCESS) - return result; - + 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; - - *pSwapchain = radv_swapchain_to_handle(swapchain); - - return VK_SUCCESS; + alloc = &device->alloc; + + return wsi_common_create_swapchain(&device->physical_device->wsi_device, + radv_device_to_handle(device), + device->physical_device->local_fd, + pCreateInfo, + alloc, + pSwapchain); } void radv_DestroySwapchainKHR( - VkDevice device, - VkSwapchainKHR _swapchain, + VkDevice _device, + VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator) { - RADV_FROM_HANDLE(radv_swapchain, swapchain, _swapchain); + RADV_FROM_HANDLE(radv_device, device, _device); + const VkAllocationCallbacks *alloc; - for (unsigned i = 0; i < ARRAY_SIZE(swapchain->fences); i++) { - if (swapchain->fences[i] != VK_NULL_HANDLE) - radv_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 radv_GetSwapchainImagesKHR( VkDevice device, - VkSwapchainKHR _swapchain, + VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages) { - RADV_FROM_HANDLE(radv_swapchain, swapchain, _swapchain); - - return swapchain->get_images(swapchain, pSwapchainImageCount, + return wsi_common_get_images(swapchain, + pSwapchainImageCount, pSwapchainImages); } VkResult radv_AcquireNextImageKHR( - VkDevice device, - VkSwapchainKHR _swapchain, + VkDevice _device, + VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, - VkFence fence, + VkFence _fence, uint32_t* pImageIndex) { - RADV_FROM_HANDLE(radv_swapchain, swapchain, _swapchain); - - return swapchain->acquire_next_image(swapchain, timeout, semaphore, - pImageIndex); + RADV_FROM_HANDLE(radv_device, device, _device); + struct radv_physical_device *pdevice = device->physical_device; + RADV_FROM_HANDLE(radv_fence, fence, _fence); + + VkResult result = wsi_common_acquire_next_image(&pdevice->wsi_device, + _device, + swapchain, + timeout, + semaphore, + pImageIndex); + + if (fence && (result == VK_SUCCESS || result == VK_SUBOPTIMAL_KHR)) { + fence->submitted = true; + fence->signalled = true; + if (fence->temp_syncobj) { + device->ws->signal_syncobj(device->ws, fence->temp_syncobj); + } else if (fence->syncobj) { + device->ws->signal_syncobj(device->ws, fence->syncobj); + } + } + return result; } VkResult radv_QueuePresentKHR( @@ -203,44 +228,9 @@ VkResult radv_QueuePresentKHR( const VkPresentInfoKHR* pPresentInfo) { RADV_FROM_HANDLE(radv_queue, queue, _queue); - VkResult result = VK_SUCCESS; - - for (uint32_t i = 0; i < pPresentInfo->swapchainCount; i++) { - RADV_FROM_HANDLE(radv_swapchain, swapchain, pPresentInfo->pSwapchains[i]); - - assert(swapchain->device == queue->device); - if (swapchain->fences[0] == VK_NULL_HANDLE) { - result = radv_CreateFence(radv_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 { - radv_ResetFences(radv_device_to_handle(queue->device), - 1, &swapchain->fences[0]); - } - - radv_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) { - radv_WaitForFences(radv_device_to_handle(queue->device), - 1, &last, true, 1); - } - - } - - return VK_SUCCESS; + return wsi_common_queue_present(&queue->device->physical_device->wsi_device, + radv_device_to_handle(queue->device), + _queue, + queue->queue_family_index, + pPresentInfo); }