struct wsi_wayland;
+struct wsi_wl_display_drm {
+ struct wl_drm * wl_drm;
+ struct u_vector formats;
+ uint32_t capabilities;
+};
+
+struct wsi_wl_display_dmabuf {
+ struct zwp_linux_dmabuf_v1 * wl_dmabuf;
+ struct u_vector formats;
+ struct {
+ struct u_vector argb8888;
+ struct u_vector xrgb8888;
+ } modifiers;
+};
+
struct wsi_wl_display {
/* The real wl_display */
struct wl_display * wl_display;
/* Actually a proxy wrapper around the event queue */
struct wl_display * wl_display_wrapper;
struct wl_event_queue * queue;
- struct wl_drm * drm;
- struct zwp_linux_dmabuf_v1 * dmabuf;
- struct wsi_wayland *wsi_wl;
- /* Vector of VkFormats supported */
- struct u_vector formats;
+ struct wsi_wl_display_drm drm;
+ struct wsi_wl_display_dmabuf dmabuf;
- struct {
- struct u_vector argb8888;
- struct u_vector xrgb8888;
- } modifiers;
+ struct wsi_wayland *wsi_wl;
- uint32_t capabilities;
+ /* Points to formats in wsi_wl_display_drm or wsi_wl_display_dmabuf */
+ struct u_vector * formats;
/* Only used for displays created by wsi_wl_display_create */
uint32_t refcount;
};
static void
-wsi_wl_display_add_vk_format(struct wsi_wl_display *display, VkFormat format)
+wsi_wl_display_add_vk_format(struct wsi_wl_display *display,
+ struct u_vector *formats, VkFormat format)
{
/* Don't add a format that's already in the list */
VkFormat *f;
- u_vector_foreach(f, &display->formats)
+ u_vector_foreach(f, formats)
if (*f == format)
return;
if (!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
return;
- f = u_vector_add(&display->formats);
+ f = u_vector_add(formats);
if (f)
*f = format;
}
+static void
+wsi_wl_display_add_wl_format(struct wsi_wl_display *display,
+ struct u_vector *formats, uint32_t wl_format)
+{
+ switch (wl_format) {
+#if 0
+ case WL_DRM_FORMAT_ABGR4444:
+ case WL_DRM_FORMAT_XBGR4444:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_R4G4B4A4_UNORM);
+ break;
+ case WL_DRM_FORMAT_BGR565:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_R5G6B5_UNORM);
+ break;
+ case WL_DRM_FORMAT_ABGR1555:
+ case WL_DRM_FORMAT_XBGR1555:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_R5G5B5A1_UNORM);
+ break;
+ case WL_DRM_FORMAT_XBGR8888:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_R8G8B8_UNORM);
+ /* fallthrough */
+ case WL_DRM_FORMAT_ABGR8888:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_R8G8B8A8_UNORM);
+ break;
+ case WL_DRM_FORMAT_ABGR2101010:
+ case WL_DRM_FORMAT_XBGR2101010:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_R10G10B10A2_UNORM);
+ break;
+ case WL_DRM_FORMAT_ARGB4444:
+ case WL_DRM_FORMAT_XRGB4444:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B4G4R4A4_UNORM);
+ break;
+ case WL_DRM_FORMAT_RGB565:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B5G6R5_UNORM);
+ break;
+ case WL_DRM_FORMAT_ARGB1555:
+ case WL_DRM_FORMAT_XRGB1555:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B5G5R5A1_UNORM);
+ break;
+#endif
+ case WL_DRM_FORMAT_XRGB8888:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B8G8R8_SRGB);
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B8G8R8_UNORM);
+ /* fallthrough */
+ case WL_DRM_FORMAT_ARGB8888:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B8G8R8A8_SRGB);
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B8G8R8A8_UNORM);
+ break;
+#if 0
+ case WL_DRM_FORMAT_ARGB2101010:
+ case WL_DRM_FORMAT_XRGB2101010:
+ wsi_wl_display_add_vk_format(display, formats,
+ VK_FORMAT_B10G10R10A2_UNORM);
+ break;
+#endif
+ }
+}
+
static void
drm_handle_device(void *data, struct wl_drm *drm, const char *name)
{
drm_handle_format(void *data, struct wl_drm *drm, uint32_t wl_format)
{
struct wsi_wl_display *display = data;
- if (display->formats.element_size == 0)
+ if (display->drm.formats.element_size == 0)
return;
- switch (wl_format) {
-#if 0
- case WL_DRM_FORMAT_ABGR4444:
- case WL_DRM_FORMAT_XBGR4444:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_R4G4B4A4_UNORM);
- break;
- case WL_DRM_FORMAT_BGR565:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_R5G6B5_UNORM);
- break;
- case WL_DRM_FORMAT_ABGR1555:
- case WL_DRM_FORMAT_XBGR1555:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_R5G5B5A1_UNORM);
- break;
- case WL_DRM_FORMAT_XBGR8888:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_R8G8B8_UNORM);
- /* fallthrough */
- case WL_DRM_FORMAT_ABGR8888:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_R8G8B8A8_UNORM);
- break;
- case WL_DRM_FORMAT_ABGR2101010:
- case WL_DRM_FORMAT_XBGR2101010:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_R10G10B10A2_UNORM);
- break;
- case WL_DRM_FORMAT_ARGB4444:
- case WL_DRM_FORMAT_XRGB4444:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B4G4R4A4_UNORM);
- break;
- case WL_DRM_FORMAT_RGB565:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B5G6R5_UNORM);
- break;
- case WL_DRM_FORMAT_ARGB1555:
- case WL_DRM_FORMAT_XRGB1555:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B5G5R5A1_UNORM);
- break;
-#endif
- case WL_DRM_FORMAT_XRGB8888:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B8G8R8_SRGB);
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B8G8R8_UNORM);
- /* fallthrough */
- case WL_DRM_FORMAT_ARGB8888:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B8G8R8A8_SRGB);
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B8G8R8A8_UNORM);
- break;
-#if 0
- case WL_DRM_FORMAT_ARGB2101010:
- case WL_DRM_FORMAT_XRGB2101010:
- wsi_wl_display_add_vk_format(display, VK_FORMAT_B10G10R10A2_UNORM);
- break;
-#endif
- }
+ wsi_wl_display_add_wl_format(display, &display->drm.formats, wl_format);
}
static void
{
struct wsi_wl_display *display = data;
- display->capabilities = capabilities;
+ display->drm.capabilities = capabilities;
}
static const struct wl_drm_listener drm_listener = {
uint64_t *mod = NULL;
/* If we're not fetching formats, don't fetch modifiers either. */
- if (display->formats.element_size == 0)
+ if (display->dmabuf.formats.element_size == 0)
return;
if (modifier_hi == (DRM_FORMAT_MOD_INVALID >> 32) &&
switch (format) {
case WL_DRM_FORMAT_ARGB8888:
- mod = u_vector_add(&display->modifiers.argb8888);
+ wsi_wl_display_add_wl_format(display, &display->dmabuf.formats, format);
+ mod = u_vector_add(&display->dmabuf.modifiers.argb8888);
break;
case WL_DRM_FORMAT_XRGB8888:
- mod = u_vector_add(&display->modifiers.xrgb8888);
+ wsi_wl_display_add_wl_format(display, &display->dmabuf.formats, format);
+ mod = u_vector_add(&display->dmabuf.modifiers.xrgb8888);
break;
default:
break;
struct wsi_wl_display *display = data;
if (strcmp(interface, "wl_drm") == 0) {
- assert(display->drm == NULL);
+ assert(display->drm.wl_drm == NULL);
assert(version >= 2);
- display->drm = wl_registry_bind(registry, name, &wl_drm_interface, 2);
-
- if (display->drm)
- wl_drm_add_listener(display->drm, &drm_listener, display);
- } else if (strcmp(interface, "zwp_linux_dmabuf_v1") == 0 && version >= 3) {
- display->dmabuf =
+ display->drm.wl_drm =
+ wl_registry_bind(registry, name, &wl_drm_interface, 2);
+ wl_drm_add_listener(display->drm.wl_drm, &drm_listener, display);
+ } else if (strcmp(interface, "zwp_linux_dmabuf_v1") == 0 && version >= 3 &&
+ display->wsi_wl->wsi->supports_modifiers) {
+ display->dmabuf.wl_dmabuf =
wl_registry_bind(registry, name, &zwp_linux_dmabuf_v1_interface, 3);
- zwp_linux_dmabuf_v1_add_listener(display->dmabuf, &dmabuf_listener,
- display);
+ zwp_linux_dmabuf_v1_add_listener(display->dmabuf.wl_dmabuf,
+ &dmabuf_listener, display);
}
}
{
assert(display->refcount == 0);
- u_vector_finish(&display->formats);
- u_vector_finish(&display->modifiers.argb8888);
- u_vector_finish(&display->modifiers.xrgb8888);
- if (display->drm)
- wl_drm_destroy(display->drm);
- if (display->dmabuf)
- zwp_linux_dmabuf_v1_destroy(display->dmabuf);
+ u_vector_finish(&display->drm.formats);
+ u_vector_finish(&display->dmabuf.formats);
+ u_vector_finish(&display->dmabuf.modifiers.argb8888);
+ u_vector_finish(&display->dmabuf.modifiers.xrgb8888);
+ if (display->drm.wl_drm)
+ wl_drm_destroy(display->drm.wl_drm);
+ if (display->dmabuf.wl_dmabuf)
+ zwp_linux_dmabuf_v1_destroy(display->dmabuf.wl_dmabuf);
if (display->wl_display_wrapper)
wl_proxy_wrapper_destroy(display->wl_display_wrapper);
if (display->queue)
display->wl_display = wl_display;
if (get_format_list) {
- if (!u_vector_init(&display->formats, sizeof(VkFormat), 8) ||
- !u_vector_init(&display->modifiers.argb8888, sizeof(uint64_t), 32) ||
- !u_vector_init(&display->modifiers.xrgb8888, sizeof(uint64_t), 32)) {
+ if (!u_vector_init(&display->drm.formats, sizeof(VkFormat), 8) ||
+ !u_vector_init(&display->dmabuf.formats, sizeof(VkFormat), 8) ||
+ !u_vector_init(&display->dmabuf.modifiers.argb8888,
+ sizeof(uint64_t), 32) ||
+ !u_vector_init(&display->dmabuf.modifiers.xrgb8888,
+ sizeof(uint64_t), 32)) {
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto fail;
}
wl_registry_add_listener(registry, ®istry_listener, display);
- /* Round-trip to get the wl_drm global */
+ /* Round-trip to get wl_drms and zwp_linux_dmabuf_v1 globals */
wl_display_roundtrip_queue(display->wl_display, display->queue);
- if (!display->drm) {
- result = VK_ERROR_SURFACE_LOST_KHR;
- goto fail_registry;
- }
+ /* Round-trip again to get formats, modifiers and capabilities */
+ if (display->drm.wl_drm || display->dmabuf.wl_dmabuf)
+ wl_display_roundtrip_queue(display->wl_display, display->queue);
- /* Round-trip to get wl_drm formats and capabilities */
- wl_display_roundtrip_queue(display->wl_display, display->queue);
+ /* We need prime support for wl_drm */
+ if (display->drm.wl_drm &&
+ (display->drm.capabilities & WL_DRM_CAPABILITY_PRIME)) {
+ display->formats = &display->drm.formats;
+ } else if (display->dmabuf.wl_dmabuf) {
+ display->formats = &display->dmabuf.formats;
+ }
- /* We need prime support */
- if (!(display->capabilities & WL_DRM_CAPABILITY_PRIME)) {
+ if (!display->formats) {
result = VK_ERROR_SURFACE_LOST_KHR;
goto fail_registry;
}
VK_OUTARRAY_MAKE(out, pSurfaceFormats, pSurfaceFormatCount);
VkFormat *disp_fmt;
- u_vector_foreach(disp_fmt, &display.formats) {
+ u_vector_foreach(disp_fmt, display.formats) {
vk_outarray_append(&out, out_fmt) {
out_fmt->format = *disp_fmt;
out_fmt->colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
VK_OUTARRAY_MAKE(out, pSurfaceFormats, pSurfaceFormatCount);
VkFormat *disp_fmt;
- u_vector_foreach(disp_fmt, &display.formats) {
+ u_vector_foreach(disp_fmt, display.formats) {
vk_outarray_append(&out, out_fmt) {
out_fmt->surfaceFormat.format = *disp_fmt;
out_fmt->surfaceFormat.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
if (!chain->drm_wrapper) {
/* Only request modifiers if we have dmabuf, else it must be implicit. */
- assert(display->dmabuf);
+ assert(display->dmabuf.wl_dmabuf);
assert(image->base.drm_modifier != DRM_FORMAT_MOD_INVALID);
struct zwp_linux_buffer_params_v1 *params =
- zwp_linux_dmabuf_v1_create_params(display->dmabuf);
+ zwp_linux_dmabuf_v1_create_params(display->dmabuf.wl_dmabuf);
wl_proxy_set_queue((struct wl_proxy *) params, chain->display->queue);
for (int i = 0; i < image->base.num_planes; i++) {
chain->base.get_wsi_image = wsi_wl_swapchain_get_wsi_image;
chain->base.acquire_next_image = wsi_wl_swapchain_acquire_next_image;
chain->base.queue_present = wsi_wl_swapchain_queue_present;
- chain->base.present_mode = pCreateInfo->presentMode;
+ chain->base.present_mode = wsi_swapchain_get_present_mode(wsi_device, pCreateInfo);
chain->base.image_count = num_images;
chain->extent = pCreateInfo->imageExtent;
chain->vk_format = pCreateInfo->imageFormat;
/* Use explicit DRM format modifiers when both the server and the driver
* support them.
*/
- if (chain->display->dmabuf && chain->base.wsi->supports_modifiers) {
+ if (chain->display->dmabuf.wl_dmabuf &&
+ chain->base.wsi->supports_modifiers) {
struct u_vector *modifiers;
switch (chain->drm_format) {
case WL_DRM_FORMAT_ARGB8888:
- modifiers = &chain->display->modifiers.argb8888;
+ modifiers = &chain->display->dmabuf.modifiers.argb8888;
break;
case WL_DRM_FORMAT_XRGB8888:
- modifiers = &chain->display->modifiers.xrgb8888;
+ modifiers = &chain->display->dmabuf.modifiers.xrgb8888;
break;
default:
modifiers = NULL;
* wl_drm.
*/
if (!chain->num_drm_modifiers) {
- chain->drm_wrapper = wl_proxy_create_wrapper(chain->display->drm);
+ assert(chain->display->drm.wl_drm);
+
+ chain->drm_wrapper =
+ wl_proxy_create_wrapper(chain->display->drm.wl_drm);
if (!chain->drm_wrapper) {
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto fail;
projects / mesa.git / blobdiff