#include "anv_private.h"
#include "wsi_common.h"
#include "vk_format_info.h"
+#include "vk_util.h"
-static const struct anv_wsi_callbacks anv_wsi_cbs = {
- .get_phys_device_format_properties = anv_GetPhysicalDeviceFormatProperties,
-};
+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_device.wsi, 0, sizeof(physical_device->wsi_device.wsi));
-
-#ifdef VK_USE_PLATFORM_XCB_KHR
- result = anv_x11_init_wsi(&physical_device->wsi_device, &physical_device->instance->alloc);
+ 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->wsi_device, &physical_device->instance->alloc,
- anv_physical_device_to_handle(physical_device),
- &anv_wsi_cbs);
- if (result != VK_SUCCESS) {
-#ifdef VK_USE_PLATFORM_XCB_KHR
- anv_x11_finish_wsi(&physical_device->wsi_device, &physical_device->instance->alloc);
-#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;
}
void
anv_finish_wsi(struct anv_physical_device *physical_device)
{
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
- anv_wl_finish_wsi(&physical_device->wsi_device, &physical_device->instance->alloc);
-#endif
-#ifdef VK_USE_PLATFORM_XCB_KHR
- anv_x11_finish_wsi(&physical_device->wsi_device, &physical_device->instance->alloc);
-#endif
+ wsi_device_finish(&physical_device->wsi_device,
+ &physical_device->instance->alloc);
}
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);
}
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_device.wsi[surface->platform];
- return iface->get_support(surface, &device->wsi_device,
- &device->instance->alloc,
- 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_device.wsi[surface->platform];
- return iface->get_capabilities(surface, pSurfaceCapabilities);
+ return wsi_common_get_surface_capabilities(&device->wsi_device,
+ surface,
+ pSurfaceCapabilities);
}
-VkResult anv_GetPhysicalDeviceSurfaceFormatsKHR(
+VkResult anv_GetPhysicalDeviceSurfaceCapabilities2KHR(
VkPhysicalDevice physicalDevice,
- VkSurfaceKHR _surface,
- uint32_t* pSurfaceFormatCount,
- VkSurfaceFormatKHR* pSurfaceFormats)
+ const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
+ VkSurfaceCapabilities2KHR* pSurfaceCapabilities)
{
ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
- ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface);
- struct anv_wsi_interface *iface = device->wsi_device.wsi[surface->platform];
- return iface->get_formats(surface, &device->wsi_device, pSurfaceFormatCount,
- pSurfaceFormats);
+ return wsi_common_get_surface_capabilities2(&device->wsi_device,
+ pSurfaceInfo,
+ pSurfaceCapabilities);
}
-VkResult anv_GetPhysicalDeviceSurfacePresentModesKHR(
+VkResult anv_GetPhysicalDeviceSurfaceFormatsKHR(
VkPhysicalDevice physicalDevice,
- VkSurfaceKHR _surface,
- uint32_t* pPresentModeCount,
- VkPresentModeKHR* pPresentModes)
+ 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_device.wsi[surface->platform];
- return iface->get_present_modes(surface, pPresentModeCount,
- pPresentModes);
+ return wsi_common_get_surface_formats(&device->wsi_device, surface,
+ pSurfaceFormatCount, pSurfaceFormats);
}
-
-static VkResult
-x11_anv_wsi_image_create(VkDevice device_h,
- const VkSwapchainCreateInfoKHR *pCreateInfo,
- const VkAllocationCallbacks* pAllocator,
- VkImage *image_p,
- VkDeviceMemory *memory_p,
- uint32_t *size,
- uint32_t *offset,
- uint32_t *row_pitch, int *fd_p)
+VkResult anv_GetPhysicalDeviceSurfaceFormats2KHR(
+ VkPhysicalDevice physicalDevice,
+ const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
+ uint32_t* pSurfaceFormatCount,
+ VkSurfaceFormat2KHR* pSurfaceFormats)
{
- struct anv_device *device = anv_device_from_handle(device_h);
- VkImage image_h;
- struct anv_image *image;
-
- VkResult result;
- result = anv_image_create(anv_device_to_handle(device),
- &(struct anv_image_create_info) {
- .isl_tiling_flags = ISL_TILING_X_BIT,
- .stride = 0,
- .vk_info =
- &(VkImageCreateInfo) {
- .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
- .imageType = VK_IMAGE_TYPE_2D,
- .format = pCreateInfo->imageFormat,
- .extent = {
- .width = pCreateInfo->imageExtent.width,
- .height = pCreateInfo->imageExtent.height,
- .depth = 1
- },
- .mipLevels = 1,
- .arrayLayers = 1,
- .samples = 1,
- /* FIXME: Need a way to use X tiling to allow scanout */
- .tiling = VK_IMAGE_TILING_OPTIMAL,
- .usage = (pCreateInfo->imageUsage |
- VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT),
- .flags = 0,
- }},
- NULL,
- &image_h);
- if (result != VK_SUCCESS)
- return result;
-
- image = anv_image_from_handle(image_h);
- assert(vk_format_is_color(image->vk_format));
-
- VkDeviceMemory memory_h;
- struct anv_device_memory *memory;
- result = anv_AllocateMemory(anv_device_to_handle(device),
- &(VkMemoryAllocateInfo) {
- .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
- .allocationSize = image->size,
- .memoryTypeIndex = 0,
- },
- NULL /* XXX: pAllocator */,
- &memory_h);
- if (result != VK_SUCCESS)
- goto fail_create_image;
-
- memory = anv_device_memory_from_handle(memory_h);
- memory->bo.is_winsys_bo = true;
-
- anv_BindImageMemory(VK_NULL_HANDLE, image_h, memory_h, 0);
-
- struct anv_surface *surface = &image->color_surface;
- assert(surface->isl.tiling == ISL_TILING_X);
-
- *row_pitch = surface->isl.row_pitch;
- int ret = anv_gem_set_tiling(device, memory->bo.gem_handle,
- surface->isl.row_pitch, I915_TILING_X);
- if (ret) {
- /* FINISHME: Choose a better error. */
- result = vk_errorf(VK_ERROR_OUT_OF_DEVICE_MEMORY,
- "set_tiling failed: %m");
- goto fail_alloc_memory;
- }
-
- int fd = anv_gem_handle_to_fd(device, memory->bo.gem_handle);
- if (fd == -1) {
- /* FINISHME: Choose a better error. */
- result = vk_errorf(VK_ERROR_OUT_OF_DEVICE_MEMORY,
- "handle_to_fd failed: %m");
- goto fail_alloc_memory;
- }
-
- *image_p = image_h;
- *memory_p = memory_h;
- *fd_p = fd;
- *size = image->size;
- *offset = image->offset;
- return VK_SUCCESS;
-fail_alloc_memory:
- anv_FreeMemory(device_h, memory_h, pAllocator);
+ ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
-fail_create_image:
- anv_DestroyImage(device_h, image_h, pAllocator);
- return result;
+ return wsi_common_get_surface_formats2(&device->wsi_device, pSurfaceInfo,
+ pSurfaceFormatCount, pSurfaceFormats);
}
-static void
-x11_anv_wsi_image_free(VkDevice device,
- const VkAllocationCallbacks* pAllocator,
- VkImage image_h,
- VkDeviceMemory memory_h)
+VkResult anv_GetPhysicalDeviceSurfacePresentModesKHR(
+ VkPhysicalDevice physicalDevice,
+ VkSurfaceKHR surface,
+ uint32_t* pPresentModeCount,
+ VkPresentModeKHR* pPresentModes)
{
- anv_DestroyImage(device, image_h, pAllocator);
+ ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
- anv_FreeMemory(device, memory_h, pAllocator);
+ return wsi_common_get_surface_present_modes(&device->wsi_device, surface,
+ pPresentModeCount,
+ pPresentModes);
}
-static const struct anv_wsi_image_fns anv_wsi_image_fns = {
- .create_wsi_image = x11_anv_wsi_image_create,
- .free_wsi_image = x11_anv_wsi_image_free,
-};
-
VkResult anv_CreateSwapchainKHR(
VkDevice _device,
const VkSwapchainCreateInfoKHR* pCreateInfo,
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_device.wsi[surface->platform];
- struct anv_swapchain *swapchain;
+ struct wsi_device *wsi_device = &device->instance->physicalDevice.wsi_device;
const VkAllocationCallbacks *alloc;
if (pAllocator)
alloc = pAllocator;
else
alloc = &device->alloc;
- VkResult result = iface->create_swapchain(surface, _device,
- &device->instance->physicalDevice.wsi_device,
- pCreateInfo,
- alloc, &anv_wsi_image_fns,
- &swapchain);
- if (result != VK_SUCCESS)
- return result;
-
- swapchain->alloc = *alloc;
-
- for (unsigned i = 0; i < ARRAY_SIZE(swapchain->fences); i++)
- swapchain->fences[i] = VK_NULL_HANDLE;
-
- *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,
+ VkSwapchainKHR swapchain,
const VkAllocationCallbacks* pAllocator)
{
ANV_FROM_HANDLE(anv_device, device, _device);
- ANV_FROM_HANDLE(anv_swapchain, swapchain, _swapchain);
const VkAllocationCallbacks *alloc;
if (pAllocator)
alloc = pAllocator;
else
alloc = &device->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);
- }
- swapchain->destroy(swapchain, alloc);
+ 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);
+ 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 swapchain->acquire_next_image(swapchain, timeout, semaphore,
- pImageIndex);
+ return result;
}
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);
+}
+
+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;
- for (uint32_t i = 0; i < pPresentInfo->swapchainCount; i++) {
- ANV_FROM_HANDLE(anv_swapchain, swapchain, pPresentInfo->pSwapchains[i]);
-
- assert(anv_device_from_handle(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,
- 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 VK_SUCCESS;
+}
+
+VkResult anv_GetDeviceGroupSurfacePresentModesKHR(
+ VkDevice device,
+ VkSurfaceKHR surface,
+ VkDeviceGroupPresentModeFlagsKHR* pModes)
+{
+ *pModes = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR;
return VK_SUCCESS;
}
projects / mesa.git / blobdiff