X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fvulkan%2Fanv_wsi.c;h=024bc1c245dac420599557a3c91e99fbb12c6c29;hb=54e21e145e02824ff5250a39b6121bf7630136ac;hp=c2938f3836fd79da765cc7f5f5d0eb8ad1cf122d;hpb=2c3f95d6aaab38cd66dd3dee1b089d5c91928eea;p=mesa.git diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index c2938f3836f..024bc1c245d 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -21,35 +21,49 @@ * 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_instance *instance) +anv_init_wsi(struct anv_physical_device *physical_device) { VkResult result; - result = anv_x11_init_wsi(instance); + result = wsi_device_init(&physical_device->wsi_device, + anv_physical_device_to_handle(physical_device), + anv_wsi_proc_addr, + &physical_device->instance->alloc, + physical_device->master_fd); if (result != VK_SUCCESS) return result; -#ifdef HAVE_WAYLAND_PLATFORM - result = anv_wl_init_wsi(instance); - if (result != VK_SUCCESS) { - anv_x11_finish_wsi(instance); - 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; } void -anv_finish_wsi(struct anv_instance *instance) +anv_finish_wsi(struct anv_physical_device *physical_device) { -#ifdef HAVE_WAYLAND_PLATFORM - anv_wl_finish_wsi(instance); -#endif - anv_x11_finish_wsi(instance); + wsi_device_finish(&physical_device->wsi_device, + &physical_device->instance->alloc); } void anv_DestroySurfaceKHR( @@ -58,62 +72,99 @@ 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); - anv_free2(&instance->alloc, pAllocator, surface); + if (!surface) + return; + + vk_free2(&instance->alloc, pAllocator, surface); } 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->instance->wsi[surface->platform]; - return iface->get_support(surface, device, queueFamilyIndex, pSupported); + return wsi_common_get_surface_support(&device->wsi_device, + queueFamilyIndex, + surface, + 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->instance->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_GetPhysicalDeviceSurfaceCapabilities2EXT( + VkPhysicalDevice physicalDevice, + VkSurfaceKHR surface, + VkSurfaceCapabilities2EXT* pSurfaceCapabilities) +{ + ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); + + return wsi_common_get_surface_capabilities2ext(&device->wsi_device, + surface, + 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->instance->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->instance->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( @@ -123,67 +174,87 @@ 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->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; - - *pSwapchain = anv_swapchain_to_handle(swapchain); + alloc = &device->alloc; - return VK_SUCCESS; + return wsi_common_create_swapchain(wsi_device, _device, + 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, + VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex) { - ANV_FROM_HANDLE(anv_swapchain, swapchain, _swapchain); + VkAcquireNextImageInfoKHR acquire_info = { + .sType = VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR, + .swapchain = swapchain, + .timeout = timeout, + .semaphore = semaphore, + .fence = fence, + .deviceMask = 0, + }; + + return anv_AcquireNextImage2KHR(device, &acquire_info, pImageIndex); +} + +VkResult anv_AcquireNextImage2KHR( + VkDevice _device, + const VkAcquireNextImageInfoKHR* pAcquireInfo, + uint32_t* pImageIndex) +{ + ANV_FROM_HANDLE(anv_device, device, _device); + struct anv_physical_device *pdevice = &device->instance->physicalDevice; + + VkResult result = wsi_common_acquire_next_image2(&pdevice->wsi_device, + _device, + pAcquireInfo, + pImageIndex); + + /* Thanks to implicit sync, the image is ready immediately. However, we + * should wait for the current GPU state to finish. + */ + if (pAcquireInfo->fence != VK_NULL_HANDLE) { + anv_QueueSubmit(anv_queue_to_handle(&device->queue), 0, NULL, + pAcquireInfo->fence); + } - return swapchain->acquire_next_image(swapchain, timeout, semaphore, - pImageIndex); + return result; } VkResult anv_QueuePresentKHR( @@ -191,44 +262,46 @@ VkResult anv_QueuePresentKHR( const VkPresentInfoKHR* pPresentInfo) { ANV_FROM_HANDLE(anv_queue, queue, _queue); - VkResult result; + struct anv_physical_device *pdevice = + &queue->device->instance->physicalDevice; - 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); - } - } + return wsi_common_queue_present(&pdevice->wsi_device, + anv_device_to_handle(queue->device), + _queue, 0, + pPresentInfo); +} + +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; +} + +VkResult anv_GetPhysicalDevicePresentRectanglesKHR( + VkPhysicalDevice physicalDevice, + VkSurfaceKHR surface, + uint32_t* pRectCount, + VkRect2D* pRects) +{ + ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); + + return wsi_common_get_present_rectangles(&device->wsi_device, + surface, + pRectCount, pRects); +}