#include "vk_format_info.h"
#include "vk_util.h"
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-#define WSI_CB(x) .x = anv_##x
-static const struct wsi_callbacks wsi_cbs = {
- WSI_CB(GetPhysicalDeviceFormatProperties),
-};
-#endif
-
static PFN_vkVoidFunction
anv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
{
return anv_lookup_entrypoint(&physical_device->info, pName);
}
-static uint32_t
-anv_wsi_queue_get_family_index(VkQueue queue)
+static uint64_t
+anv_wsi_image_get_modifier(VkImage _image)
{
- return 0;
+ ANV_FROM_HANDLE(anv_image, image, _image);
+ return image->drm_format_mod;
}
VkResult
{
VkResult result;
- wsi_device_init(&physical_device->wsi_device,
- anv_physical_device_to_handle(physical_device),
- anv_wsi_proc_addr);
-
- physical_device->wsi_device.queue_get_family_index =
- anv_wsi_queue_get_family_index;
-
-#ifdef VK_USE_PLATFORM_XCB_KHR
- result = wsi_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 = wsi_wl_init_wsi(&physical_device->wsi_device, &physical_device->instance->alloc,
- anv_physical_device_to_handle(physical_device),
- &wsi_cbs);
- if (result != VK_SUCCESS) {
-#ifdef VK_USE_PLATFORM_XCB_KHR
- wsi_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
- wsi_wl_finish_wsi(&physical_device->wsi_device, &physical_device->instance->alloc);
-#endif
-#ifdef VK_USE_PLATFORM_XCB_KHR
- wsi_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(
VkResult anv_GetPhysicalDeviceSurfaceSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
- VkSurfaceKHR _surface,
+ VkSurfaceKHR surface,
VkBool32* pSupported)
{
ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
- ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface);
- struct wsi_interface *iface = device->wsi_device.wsi[surface->platform];
- return iface->get_support(surface, &device->wsi_device,
- &device->instance->alloc,
- queueFamilyIndex, device->local_fd, true, 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);
- ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface);
- struct 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_GetPhysicalDeviceSurfaceCapabilities2KHR(
VkSurfaceCapabilities2KHR* pSurfaceCapabilities)
{
ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
- ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, pSurfaceInfo->surface);
- struct wsi_interface *iface = device->wsi_device.wsi[surface->platform];
- return iface->get_capabilities2(surface, pSurfaceInfo->pNext,
- pSurfaceCapabilities);
+ 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);
- ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface);
- struct wsi_interface *iface = device->wsi_device.wsi[surface->platform];
- return iface->get_formats(surface, &device->wsi_device, pSurfaceFormatCount,
- pSurfaceFormats);
+ return wsi_common_get_surface_formats(&device->wsi_device, surface,
+ pSurfaceFormatCount, pSurfaceFormats);
}
VkResult anv_GetPhysicalDeviceSurfaceFormats2KHR(
VkSurfaceFormat2KHR* pSurfaceFormats)
{
ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice);
- ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, pSurfaceInfo->surface);
- struct wsi_interface *iface = device->wsi_device.wsi[surface->platform];
- return iface->get_formats2(surface, &device->wsi_device, pSurfaceInfo->pNext,
- pSurfaceFormatCount, pSurfaceFormats);
+ 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);
- ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface);
- struct wsi_interface *iface = device->wsi_device.wsi[surface->platform];
- return iface->get_present_modes(surface, pPresentModeCount,
- pPresentModes);
+ return wsi_common_get_surface_present_modes(&device->wsi_device, surface,
+ pPresentModeCount,
+ pPresentModes);
}
VkResult anv_CreateSwapchainKHR(
VkResult anv_AcquireNextImageKHR(
VkDevice _device,
- VkSwapchainKHR _swapchain,
+ VkSwapchainKHR swapchain,
uint64_t timeout,
VkSemaphore semaphore,
- VkFence _fence,
+ VkFence fence,
uint32_t* pImageIndex)
{
ANV_FROM_HANDLE(anv_device, device, _device);
- ANV_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
- ANV_FROM_HANDLE(anv_fence, fence, _fence);
+ struct anv_physical_device *pdevice = &device->instance->physicalDevice;
- VkResult result = swapchain->acquire_next_image(swapchain, timeout,
- semaphore, pImageIndex);
+ 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)
- anv_QueueSubmit(anv_queue_to_handle(&device->queue), 0, NULL, _fence);
+ if (fence != VK_NULL_HANDLE)
+ anv_QueueSubmit(anv_queue_to_handle(&device->queue), 0, NULL, fence);
return result;
}
_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;
+}
projects / mesa.git / blobdiff