#include "anv_wsi.h"
-static const VkFormat formats[] = {
- VK_FORMAT_B5G6R5_UNORM,
- VK_FORMAT_B8G8R8A8_UNORM,
- VK_FORMAT_B8G8R8A8_SRGB,
+struct x11_surface {
+ struct anv_wsi_surface base;
+
+ xcb_connection_t *connection;
+ xcb_window_t window;
};
-static const VkSurfacePresentModePropertiesWSI present_modes[] = {
- { VK_PRESENT_MODE_MAILBOX_WSI },
+static const VkSurfaceFormatKHR formats[] = {
+ { .format = VK_FORMAT_B8G8R8A8_UNORM, },
};
-static VkResult
-x11_get_window_supported(struct anv_wsi_implementation *impl,
- struct anv_physical_device *physical_device,
- const VkSurfaceDescriptionWindowWSI *window,
- VkBool32 *pSupported)
+static const VkPresentModeKHR present_modes[] = {
+ VK_PRESENT_MODE_MAILBOX_KHR,
+};
+
+VkBool32 anv_GetPhysicalDeviceXcbPresentationSupportKHR(
+ VkPhysicalDevice physicalDevice,
+ uint32_t queueFamilyIndex,
+ xcb_connection_t* connection,
+ xcb_visualid_t visual_id)
{
- *pSupported = true;
- stub_return(VK_SUCCESS);
+ anv_finishme("Check that we actually have DRI3");
+ stub_return(true);
}
static VkResult
-x11_get_surface_info(struct anv_wsi_implementation *impl,
- struct anv_device *device,
- VkSurfaceDescriptionWindowWSI *window,
- VkSurfaceInfoTypeWSI infoType,
- size_t* pDataSize, void* pData)
+x11_surface_get_capabilities(struct anv_wsi_surface *wsi_surface,
+ struct anv_physical_device *device,
+ VkSurfaceCapabilitiesKHR *caps)
{
- if (pDataSize == NULL)
- return vk_error(VK_ERROR_INVALID_POINTER);
+ struct x11_surface *surface = (struct x11_surface *)wsi_surface;
+
+ xcb_get_geometry_cookie_t cookie = xcb_get_geometry(surface->connection,
+ surface->window);
+ xcb_generic_error_t *err;
+ xcb_get_geometry_reply_t *geom = xcb_get_geometry_reply(surface->connection,
+ cookie, &err);
+ if (geom) {
+ VkExtent2D extent = { geom->width, geom->height };
+ caps->currentExtent = extent;
+ caps->minImageExtent = extent;
+ caps->maxImageExtent = extent;
+ } else {
+ /* This can happen if the client didn't wait for the configure event
+ * to come back from the compositor. In that case, we don't know the
+ * size of the window so we just return valid "I don't know" stuff.
+ */
+ caps->currentExtent = (VkExtent2D) { -1, -1 };
+ caps->minImageExtent = (VkExtent2D) { 1, 1 };
+ caps->maxImageExtent = (VkExtent2D) { INT16_MAX, INT16_MAX };
+ }
+ free(err);
+ free(geom);
+
+ caps->minImageCount = 2;
+ caps->maxImageCount = 4;
+ caps->supportedTransforms = VK_SURFACE_TRANSFORM_NONE_BIT_KHR;
+ caps->currentTransform = VK_SURFACE_TRANSFORM_NONE_BIT_KHR;
+ caps->maxImageArrayLayers = 1;
+ caps->supportedCompositeAlpha = VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR;
+ caps->supportedUsageFlags =
+ VK_IMAGE_USAGE_TRANSFER_DST_BIT |
+ VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
- switch (infoType) {
- case VK_SURFACE_INFO_TYPE_PROPERTIES_WSI: {
- VkSurfacePropertiesWSI *props = pData;
+ return VK_SUCCESS;
+}
- if (pData == NULL) {
- *pDataSize = sizeof(*props);
- return VK_SUCCESS;
- }
+static VkResult
+x11_surface_get_formats(struct anv_wsi_surface *surface,
+ struct anv_physical_device *device,
+ uint32_t *pSurfaceFormatCount,
+ VkSurfaceFormatKHR *pSurfaceFormats)
+{
+ if (pSurfaceFormats == NULL) {
+ *pSurfaceFormatCount = ARRAY_SIZE(formats);
+ return VK_SUCCESS;
+ }
- assert(*pDataSize >= sizeof(*props));
+ assert(*pSurfaceFormatCount >= ARRAY_SIZE(formats));
+ typed_memcpy(pSurfaceFormats, formats, *pSurfaceFormatCount);
+ *pSurfaceFormatCount = ARRAY_SIZE(formats);
- props->minImageCount = 2;
- props->maxImageCount = 4;
- props->currentExtent = (VkExtent2D) { -1, -1 };
- props->minImageExtent = (VkExtent2D) { 1, 1 };
- props->maxImageExtent = (VkExtent2D) { INT16_MAX, INT16_MAX };
- props->supportedTransforms = VK_SURFACE_TRANSFORM_NONE_BIT_WSI;
- props->currentTransform = VK_SURFACE_TRANSFORM_NONE_WSI;
- props->maxImageArraySize = 1;
- props->supportedUsageFlags =
- VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT |
- VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+ return VK_SUCCESS;
+}
+static VkResult
+x11_surface_get_present_modes(struct anv_wsi_surface *surface,
+ struct anv_physical_device *device,
+ uint32_t *pPresentModeCount,
+ VkPresentModeKHR *pPresentModes)
+{
+ if (pPresentModes == NULL) {
+ *pPresentModeCount = ARRAY_SIZE(present_modes);
return VK_SUCCESS;
}
- case VK_SURFACE_INFO_TYPE_FORMATS_WSI:
- if (pData == NULL) {
- *pDataSize = sizeof(formats);
- return VK_SUCCESS;
- }
+ assert(*pPresentModeCount >= ARRAY_SIZE(present_modes));
+ typed_memcpy(pPresentModes, present_modes, *pPresentModeCount);
+ *pPresentModeCount = ARRAY_SIZE(present_modes);
+
+ return VK_SUCCESS;
+}
- assert(*pDataSize >= sizeof(formats));
- memcpy(pData, formats, *pDataSize);
+static void
+x11_surface_destroy(struct anv_wsi_surface *surface,
+ const VkAllocationCallbacks *pAllocator)
+{
+ anv_free2(&surface->instance->alloc, pAllocator, surface);
+}
- return VK_SUCCESS;
+static VkResult
+x11_surface_create_swapchain(struct anv_wsi_surface *surface,
+ struct anv_device *device,
+ const VkSwapchainCreateInfoKHR* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ struct anv_swapchain **swapchain);
+
+VkResult anv_CreateXcbSurfaceKHR(
+ VkInstance _instance,
+ xcb_connection_t* connection,
+ xcb_window_t window,
+ const VkAllocationCallbacks* pAllocator,
+ VkSurfaceKHR* pSurface)
+{
+ ANV_FROM_HANDLE(anv_instance, instance, _instance);
+ struct x11_surface *surface;
- case VK_SURFACE_INFO_TYPE_PRESENT_MODES_WSI:
- if (pData == NULL) {
- *pDataSize = sizeof(present_modes);
- return VK_SUCCESS;
- }
+ surface = anv_alloc2(&instance->alloc, pAllocator, sizeof *surface, 8,
+ VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+ if (surface == NULL)
+ return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
- assert(*pDataSize >= sizeof(present_modes));
- memcpy(pData, present_modes, *pDataSize);
+ surface->connection = connection;
+ surface->window = window;
- return VK_SUCCESS;
- default:
- return vk_error(VK_ERROR_INVALID_VALUE);
- }
+ surface->base.instance = instance;
+ surface->base.destroy = x11_surface_destroy;
+ surface->base.get_capabilities = x11_surface_get_capabilities;
+ surface->base.get_formats = x11_surface_get_formats;
+ surface->base.get_present_modes = x11_surface_get_present_modes;
+ surface->base.create_swapchain = x11_surface_create_swapchain;
+
+ *pSurface = anv_wsi_surface_to_handle(&surface->base);
+
+ return VK_SUCCESS;
}
-struct x11_swap_chain {
- struct anv_swap_chain base;
+struct x11_image {
+ struct anv_image * image;
+ struct anv_device_memory * memory;
+ xcb_pixmap_t pixmap;
+ xcb_get_geometry_cookie_t geom_cookie;
+ bool busy;
+};
+
+struct x11_swapchain {
+ struct anv_swapchain base;
xcb_connection_t * conn;
xcb_window_t window;
VkExtent2D extent;
uint32_t image_count;
uint32_t next_image;
- struct {
- struct anv_image * image;
- struct anv_device_memory * memory;
- xcb_pixmap_t pixmap;
- } images[0];
+ struct x11_image images[0];
};
static VkResult
-x11_get_swap_chain_info(struct anv_swap_chain *anv_chain,
- VkSwapChainInfoTypeWSI infoType,
- size_t* pDataSize, void* pData)
+x11_get_images(struct anv_swapchain *anv_chain,
+ uint32_t* pCount, VkImage *pSwapchainImages)
{
- struct x11_swap_chain *chain = (struct x11_swap_chain *)anv_chain;
- size_t size;
-
- switch (infoType) {
- case VK_SWAP_CHAIN_INFO_TYPE_IMAGES_WSI: {
- VkSwapChainImagePropertiesWSI *images = pData;
-
- size = chain->image_count * sizeof(*images);
-
- if (pData == NULL) {
- *pDataSize = size;
- return VK_SUCCESS;
- }
-
- assert(size <= *pDataSize);
- for (uint32_t i = 0; i < chain->image_count; i++)
- images[i].image = anv_image_to_handle(chain->images[i].image);
-
- *pDataSize = size;
+ struct x11_swapchain *chain = (struct x11_swapchain *)anv_chain;
+ if (pSwapchainImages == NULL) {
+ *pCount = chain->image_count;
return VK_SUCCESS;
}
- default:
- return vk_error(VK_ERROR_INVALID_VALUE);
- }
+ assert(chain->image_count <= *pCount);
+ for (uint32_t i = 0; i < chain->image_count; i++)
+ pSwapchainImages[i] = anv_image_to_handle(chain->images[i].image);
+
+ *pCount = chain->image_count;
+
+ return VK_SUCCESS;
}
static VkResult
-x11_acquire_next_image(struct anv_swap_chain *anv_chain,
+x11_acquire_next_image(struct anv_swapchain *anv_chain,
uint64_t timeout,
VkSemaphore semaphore,
uint32_t *image_index)
{
- struct x11_swap_chain *chain = (struct x11_swap_chain *)anv_chain;
+ struct x11_swapchain *chain = (struct x11_swapchain *)anv_chain;
+ struct x11_image *image = &chain->images[chain->next_image];
+
+ if (image->busy) {
+ xcb_generic_error_t *err;
+ xcb_get_geometry_reply_t *geom =
+ xcb_get_geometry_reply(chain->conn, image->geom_cookie, &err);
+ if (!geom) {
+ free(err);
+ return vk_error(VK_ERROR_OUT_OF_DATE_KHR);
+ }
+
+ if (geom->width != chain->extent.width ||
+ geom->height != chain->extent.height) {
+ free(geom);
+ return vk_error(VK_ERROR_OUT_OF_DATE_KHR);
+ }
+ free(geom);
+
+ image->busy = false;
+ }
- anv_finishme("Implement real blocking AcquireNextImage");
*image_index = chain->next_image;
chain->next_image = (chain->next_image + 1) % chain->image_count;
return VK_SUCCESS;
}
static VkResult
-x11_queue_present(struct anv_swap_chain *anv_chain,
+x11_queue_present(struct anv_swapchain *anv_chain,
struct anv_queue *queue,
uint32_t image_index)
{
- struct x11_swap_chain *chain = (struct x11_swap_chain *)anv_chain;
+ struct x11_swapchain *chain = (struct x11_swapchain *)anv_chain;
+ struct x11_image *image = &chain->images[image_index];
- xcb_void_cookie_t cookie;
+ assert(image_index < chain->image_count);
- xcb_pixmap_t pixmap = chain->images[image_index].pixmap;
-
- if (pixmap == XCB_NONE)
- return vk_error(VK_ERROR_INVALID_VALUE);
+ xcb_void_cookie_t cookie;
cookie = xcb_copy_area(chain->conn,
- pixmap,
+ image->pixmap,
chain->window,
chain->gc,
0, 0,
chain->extent.height);
xcb_discard_reply(chain->conn, cookie.sequence);
+ image->geom_cookie = xcb_get_geometry(chain->conn, chain->window);
+ image->busy = true;
+
xcb_flush(chain->conn);
return VK_SUCCESS;
}
static VkResult
-x11_destroy_swap_chain(struct anv_swap_chain *chain)
+x11_swapchain_destroy(struct anv_swapchain *anv_chain,
+ const VkAllocationCallbacks *pAllocator)
{
- anv_device_free(chain->device, chain);
+ struct x11_swapchain *chain = (struct x11_swapchain *)anv_chain;
+ xcb_void_cookie_t cookie;
+
+ for (uint32_t i = 0; i < chain->image_count; i++) {
+ struct x11_image *image = &chain->images[i];
+
+ if (image->busy)
+ xcb_discard_reply(chain->conn, image->geom_cookie.sequence);
+
+ cookie = xcb_free_pixmap(chain->conn, image->pixmap);
+ xcb_discard_reply(chain->conn, cookie.sequence);
+
+ /* TODO: Delete images and free memory */
+ }
+
+ anv_free(NULL /* XXX: pAllocator */, chain);
return VK_SUCCESS;
}
static VkResult
-x11_create_swap_chain(struct anv_wsi_implementation *impl,
- struct anv_device *device,
- const VkSwapChainCreateInfoWSI *pCreateInfo,
- struct anv_swap_chain **swap_chain_out)
+x11_surface_create_swapchain(struct anv_wsi_surface *wsi_surface,
+ struct anv_device *device,
+ const VkSwapchainCreateInfoKHR *pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ struct anv_swapchain **swapchain_out)
{
- struct x11_swap_chain *chain;
+ struct x11_surface *surface = (struct x11_surface *)wsi_surface;
+ struct x11_swapchain *chain;
xcb_void_cookie_t cookie;
VkResult result;
- assert(pCreateInfo->pSurfaceDescription->sType ==
- VK_STRUCTURE_TYPE_SURFACE_DESCRIPTION_WINDOW_WSI);
- VkSurfaceDescriptionWindowWSI *vk_window =
- (VkSurfaceDescriptionWindowWSI *)pCreateInfo->pSurfaceDescription;
- assert(vk_window->platform == VK_PLATFORM_XCB_WSI);
-
int num_images = pCreateInfo->minImageCount;
- assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SWAP_CHAIN_CREATE_INFO_WSI);
+ assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR);
size_t size = sizeof(*chain) + num_images * sizeof(chain->images[0]);
- chain = anv_device_alloc(device, size, 8,
- VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
+ chain = anv_alloc2(&device->alloc, pAllocator, size, 8,
+ VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (chain == NULL)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
chain->base.device = device;
- chain->base.destroy = x11_destroy_swap_chain;
- chain->base.get_swap_chain_info = x11_get_swap_chain_info;
+ chain->base.destroy = x11_swapchain_destroy;
+ chain->base.get_images = x11_get_images;
chain->base.acquire_next_image = x11_acquire_next_image;
chain->base.queue_present = x11_queue_present;
- VkPlatformHandleXcbWSI *vk_xcb_handle = vk_window->pPlatformHandle;
-
- chain->conn = (xcb_connection_t *) vk_xcb_handle->connection;
- chain->window = (xcb_window_t) (uintptr_t)vk_window->pPlatformWindow;
+ chain->conn = surface->connection;
+ chain->window = surface->window;
chain->extent = pCreateInfo->imageExtent;
chain->image_count = num_images;
chain->next_image = 0;
anv_image_create(anv_device_to_handle(device),
&(struct anv_image_create_info) {
- .force_tile_mode = true,
- .tile_mode = XMAJOR,
+ .force_tiling = true,
+ .tiling = ISL_TILING_X,
.stride = 0,
.vk_info =
&(VkImageCreateInfo) {
.depth = 1
},
.mipLevels = 1,
- .arraySize = 1,
+ .arrayLayers = 1,
.samples = 1,
/* FIXME: Need a way to use X tiling to allow scanout */
.tiling = VK_IMAGE_TILING_OPTIMAL,
.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
.flags = 0,
}},
+ NULL,
&image_h);
image = anv_image_from_handle(image_h);
surface = &image->color_surface;
- anv_AllocMemory(anv_device_to_handle(device),
- &(VkMemoryAllocInfo) {
- .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
- .allocationSize = image->size,
- .memoryTypeIndex = 0,
- },
- &memory_h);
+ 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);
memory = anv_device_memory_from_handle(memory_h);
memory_h, 0);
int ret = anv_gem_set_tiling(device, memory->bo.gem_handle,
- surface->stride, I915_TILING_X);
+ surface->isl.row_pitch, I915_TILING_X);
if (ret) {
- result = vk_errorf(VK_ERROR_UNKNOWN, "set_tiling failed: %m");
+ /* FINISHME: Choose a better error. */
+ result = vk_errorf(VK_ERROR_OUT_OF_DEVICE_MEMORY,
+ "set_tiling failed: %m");
goto fail;
}
int fd = anv_gem_handle_to_fd(device, memory->bo.gem_handle);
if (fd == -1) {
- result = vk_errorf(VK_ERROR_UNKNOWN, "handle_to_fd failed: %m");
+ /* FINISHME: Choose a better error. */
+ result = vk_errorf(VK_ERROR_OUT_OF_DEVICE_MEMORY,
+ "handle_to_fd failed: %m");
goto fail;
}
image->size,
pCreateInfo->imageExtent.width,
pCreateInfo->imageExtent.height,
- surface->stride,
+ surface->isl.row_pitch,
depth, bpp, fd);
chain->images[i].image = image;
chain->images[i].memory = memory;
chain->images[i].pixmap = pixmap;
+ chain->images[i].busy = false;
xcb_discard_reply(chain->conn, cookie.sequence);
}
chain->gc = xcb_generate_id(chain->conn);
if (!chain->gc) {
- result = vk_error(VK_ERROR_UNKNOWN);
+ /* FINISHME: Choose a better error. */
+ result = vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
goto fail;
}
(uint32_t []) { 0 });
xcb_discard_reply(chain->conn, cookie.sequence);
- *swap_chain_out = &chain->base;
+ *swapchain_out = &chain->base;
return VK_SUCCESS;
VkResult
anv_x11_init_wsi(struct anv_instance *instance)
{
- struct anv_wsi_implementation *impl;
-
- impl = anv_instance_alloc(instance, sizeof(*impl), 8,
- VK_SYSTEM_ALLOC_TYPE_INTERNAL);
- if (!impl)
- return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
-
- impl->get_window_supported = x11_get_window_supported;
- impl->get_surface_info = x11_get_surface_info;
- impl->create_swap_chain = x11_create_swap_chain;
-
- instance->wsi_impl[VK_PLATFORM_XCB_WSI] = impl;
-
return VK_SUCCESS;
}
void
anv_x11_finish_wsi(struct anv_instance *instance)
-{
- anv_instance_free(instance, instance->wsi_impl[VK_PLATFORM_XCB_WSI]);
-}
+{ }
projects / mesa.git / blobdiff