#include <unistd.h>
#include <fcntl.h>
#include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include <sys/mman.h>
#include "egl_dri2.h"
#include "util/u_vector.h"
#include "eglglobals.h"
+#include <wayland-egl-backend.h>
#include <wayland-client.h>
#include "wayland-drm-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
-#ifndef DRM_FORMAT_MOD_INVALID
-#define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
-#endif
+/*
+ * The index of entries in this table is used as a bitmask in
+ * dri2_dpy->formats, which tracks the formats supported by our server.
+ */
+static const struct dri2_wl_visual {
+ const char *format_name;
+ uint32_t wl_drm_format;
+ uint32_t wl_shm_format;
+ int dri_image_format;
+ /* alt_dri_image_format is a substitute wl_buffer format to use for a
+ * wl-server unsupported dri_image_format, ie. some other dri_image_format in
+ * the table, of the same precision but with different channel ordering, or
+ * __DRI_IMAGE_FORMAT_NONE if an alternate format is not needed or supported.
+ * The code checks if alt_dri_image_format can be used as a fallback for a
+ * dri_image_format for a given wl-server implementation.
+ */
+ int alt_dri_image_format;
+ int bpp;
+ unsigned int rgba_masks[4];
+} dri2_wl_visuals[] = {
+ {
+ "XRGB2101010",
+ WL_DRM_FORMAT_XRGB2101010, WL_SHM_FORMAT_XRGB2101010,
+ __DRI_IMAGE_FORMAT_XRGB2101010, __DRI_IMAGE_FORMAT_XBGR2101010, 32,
+ { 0x3ff00000, 0x000ffc00, 0x000003ff, 0x00000000 }
+ },
+ {
+ "ARGB2101010",
+ WL_DRM_FORMAT_ARGB2101010, WL_SHM_FORMAT_ARGB2101010,
+ __DRI_IMAGE_FORMAT_ARGB2101010, __DRI_IMAGE_FORMAT_ABGR2101010, 32,
+ { 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 }
+ },
+ {
+ "XBGR2101010",
+ WL_DRM_FORMAT_XBGR2101010, WL_SHM_FORMAT_XBGR2101010,
+ __DRI_IMAGE_FORMAT_XBGR2101010, __DRI_IMAGE_FORMAT_XRGB2101010, 32,
+ { 0x000003ff, 0x000ffc00, 0x3ff00000, 0x00000000 }
+ },
+ {
+ "ABGR2101010",
+ WL_DRM_FORMAT_ABGR2101010, WL_SHM_FORMAT_ABGR2101010,
+ __DRI_IMAGE_FORMAT_ABGR2101010, __DRI_IMAGE_FORMAT_ARGB2101010, 32,
+ { 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000 }
+ },
+ {
+ "XRGB8888",
+ WL_DRM_FORMAT_XRGB8888, WL_SHM_FORMAT_XRGB8888,
+ __DRI_IMAGE_FORMAT_XRGB8888, __DRI_IMAGE_FORMAT_NONE, 32,
+ { 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000 }
+ },
+ {
+ "ARGB8888",
+ WL_DRM_FORMAT_ARGB8888, WL_SHM_FORMAT_ARGB8888,
+ __DRI_IMAGE_FORMAT_ARGB8888, __DRI_IMAGE_FORMAT_NONE, 32,
+ { 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }
+ },
+ {
+ "RGB565",
+ WL_DRM_FORMAT_RGB565, WL_SHM_FORMAT_RGB565,
+ __DRI_IMAGE_FORMAT_RGB565, __DRI_IMAGE_FORMAT_NONE, 16,
+ { 0xf800, 0x07e0, 0x001f, 0x0000 }
+ },
+};
-#ifndef DRM_FORMAT_MOD_LINEAR
-#define DRM_FORMAT_MOD_LINEAR 0
-#endif
+static int
+dri2_wl_visual_idx_from_config(struct dri2_egl_display *dri2_dpy,
+ const __DRIconfig *config)
+{
+ unsigned int red, green, blue, alpha;
-enum wl_drm_format_flags {
- HAS_ARGB8888 = 1,
- HAS_XRGB8888 = 2,
- HAS_RGB565 = 4,
-};
+ dri2_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_RED_MASK, &red);
+ dri2_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_GREEN_MASK, &green);
+ dri2_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_BLUE_MASK, &blue);
+ dri2_dpy->core->getConfigAttrib(config, __DRI_ATTRIB_ALPHA_MASK, &alpha);
-static EGLBoolean
-dri2_wl_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
- EGLint interval);
+ for (unsigned int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
+ const struct dri2_wl_visual *wl_visual = &dri2_wl_visuals[i];
+
+ if (red == wl_visual->rgba_masks[0] &&
+ green == wl_visual->rgba_masks[1] &&
+ blue == wl_visual->rgba_masks[2] &&
+ alpha == wl_visual->rgba_masks[3]) {
+ return i;
+ }
+ }
+
+ return -1;
+}
+
+static int
+dri2_wl_visual_idx_from_fourcc(uint32_t fourcc)
+{
+ for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
+ /* wl_drm format codes overlap with DRIImage FourCC codes for all formats
+ * we support. */
+ if (dri2_wl_visuals[i].wl_drm_format == fourcc)
+ return i;
+ }
+
+ return -1;
+}
+
+static int
+dri2_wl_visual_idx_from_dri_image_format(uint32_t dri_image_format)
+{
+ for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
+ if (dri2_wl_visuals[i].dri_image_format == dri_image_format)
+ return i;
+ }
+
+ return -1;
+}
+
+static int
+dri2_wl_visual_idx_from_shm_format(uint32_t shm_format)
+{
+ for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
+ if (dri2_wl_visuals[i].wl_shm_format == shm_format)
+ return i;
+ }
+
+ return -1;
+}
+
+bool
+dri2_wl_is_format_supported(void* user_data, uint32_t format)
+{
+ _EGLDisplay *disp = (_EGLDisplay *) user_data;
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
+ int j = dri2_wl_visual_idx_from_fourcc(format);
+
+ if (j == -1)
+ return false;
+
+ for (int i = 0; dri2_dpy->driver_configs[i]; i++)
+ if (j == dri2_wl_visual_idx_from_config(dri2_dpy,
+ dri2_dpy->driver_configs[i]))
+ return true;
+
+ return false;
+}
static int
roundtrip(struct dri2_egl_display *dri2_dpy)
if (dri2_surf->color_buffers[i].wl_buffer == buffer)
break;
- if (i == ARRAY_SIZE(dri2_surf->color_buffers)) {
+ assert (i < ARRAY_SIZE(dri2_surf->color_buffers));
+
+ if (dri2_surf->color_buffers[i].wl_release) {
wl_buffer_destroy(buffer);
- return;
+ dri2_surf->color_buffers[i].wl_release = false;
+ dri2_surf->color_buffers[i].wl_buffer = NULL;
}
dri2_surf->color_buffers[i].locked = false;
struct dri2_egl_display *dri2_dpy =
dri2_egl_display(dri2_surf->base.Resource.Display);
+ /* Update the surface size as soon as native window is resized; from user
+ * pov, this makes the effect that resize is done immediately after native
+ * window resize, without requiring to wait until the first draw.
+ *
+ * A more detailed and lengthy explanation can be found at
+ * https://lists.freedesktop.org/archives/mesa-dev/2018-June/196474.html
+ */
+ if (!dri2_surf->back) {
+ dri2_surf->base.Width = wl_win->width;
+ dri2_surf->base.Height = wl_win->height;
+ }
dri2_dpy->flush->invalidate(dri2_surf->dri_drawable);
}
{
/* Version 3 of wl_egl_window introduced a version field at the same
* location where a pointer to wl_surface was stored. Thus, if
- * window->version is dereferencable, we've been given an older version of
+ * window->version is dereferenceable, we've been given an older version of
* wl_egl_window, and window->version points to wl_surface */
if (_eglPointerIsDereferencable((void *)(window->version))) {
return wl_proxy_create_wrapper((void *)(window->version));
_EGLConfig *conf, void *native_window,
const EGLint *attrib_list)
{
- __DRIcreateNewDrawableFunc createNewDrawable;
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
struct wl_egl_window *window = native_window;
struct dri2_egl_surface *dri2_surf;
+ int visual_idx;
const __DRIconfig *config;
dri2_surf = calloc(1, sizeof *dri2_surf);
return NULL;
}
- if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list))
+ if (!dri2_init_surface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf,
+ attrib_list, false, native_window))
goto cleanup_surf;
- if (dri2_dpy->wl_drm) {
- if (conf->RedSize == 5)
- dri2_surf->format = WL_DRM_FORMAT_RGB565;
- else if (conf->AlphaSize == 0)
- dri2_surf->format = WL_DRM_FORMAT_XRGB8888;
- else
- dri2_surf->format = WL_DRM_FORMAT_ARGB8888;
- } else {
- assert(dri2_dpy->wl_shm);
- if (conf->RedSize == 5)
- dri2_surf->format = WL_SHM_FORMAT_RGB565;
- else if (conf->AlphaSize == 0)
- dri2_surf->format = WL_SHM_FORMAT_XRGB8888;
- else
- dri2_surf->format = WL_SHM_FORMAT_ARGB8888;
- }
+ config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
+ dri2_surf->base.GLColorspace);
- if (!window) {
- _eglError(EGL_BAD_NATIVE_WINDOW, "dri2_create_surface");
+ if (!config) {
+ _eglError(EGL_BAD_MATCH, "Unsupported surfacetype/colorspace configuration");
goto cleanup_surf;
}
- dri2_surf->wl_win = window;
+ dri2_surf->base.Width = window->width;
+ dri2_surf->base.Height = window->height;
+
+ visual_idx = dri2_wl_visual_idx_from_config(dri2_dpy, config);
+ assert(visual_idx != -1);
+
+ if (dri2_dpy->wl_dmabuf || dri2_dpy->wl_drm) {
+ dri2_surf->format = dri2_wl_visuals[visual_idx].wl_drm_format;
+ } else {
+ assert(dri2_dpy->wl_shm);
+ dri2_surf->format = dri2_wl_visuals[visual_idx].wl_shm_format;
+ }
+
dri2_surf->wl_queue = wl_display_create_queue(dri2_dpy->wl_dpy);
if (!dri2_surf->wl_queue) {
_eglError(EGL_BAD_ALLOC, "dri2_create_surface");
dri2_surf->wl_surface_wrapper = get_wl_surface_proxy(window);
if (!dri2_surf->wl_surface_wrapper) {
_eglError(EGL_BAD_ALLOC, "dri2_create_surface");
- goto cleanup_drm;
+ goto cleanup_dpy_wrapper;
}
wl_proxy_set_queue((struct wl_proxy *)dri2_surf->wl_surface_wrapper,
dri2_surf->wl_queue);
- dri2_surf->wl_win->private = dri2_surf;
+ dri2_surf->wl_win = window;
+ dri2_surf->wl_win->driver_private = dri2_surf;
dri2_surf->wl_win->destroy_window_callback = destroy_window_callback;
-
- dri2_surf->base.Width = -1;
- dri2_surf->base.Height = -1;
-
- config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
- dri2_surf->base.GLColorspace);
-
if (dri2_dpy->flush)
dri2_surf->wl_win->resize_callback = resize_callback;
- if (dri2_dpy->image_driver)
- createNewDrawable = dri2_dpy->image_driver->createNewDrawable;
- else if (dri2_dpy->dri2)
- createNewDrawable = dri2_dpy->dri2->createNewDrawable;
- else
- createNewDrawable = dri2_dpy->swrast->createNewDrawable;
-
- dri2_surf->dri_drawable = (*createNewDrawable)(dri2_dpy->dri_screen, config,
- dri2_surf);
- if (dri2_surf->dri_drawable == NULL) {
- _eglError(EGL_BAD_ALLOC, "createNewDrawable");
- goto cleanup_surf;
- }
+ if (!dri2_create_drawable(dri2_dpy, config, dri2_surf))
+ goto cleanup_surf_wrapper;
- dri2_wl_swap_interval(drv, disp, &dri2_surf->base,
- dri2_dpy->default_swap_interval);
+ dri2_surf->base.SwapInterval = dri2_dpy->default_swap_interval;
return &dri2_surf->base;
+ cleanup_surf_wrapper:
+ wl_proxy_wrapper_destroy(dri2_surf->wl_surface_wrapper);
+ cleanup_dpy_wrapper:
+ wl_proxy_wrapper_destroy(dri2_surf->wl_dpy_wrapper);
cleanup_drm:
if (dri2_surf->wl_drm_wrapper)
wl_proxy_wrapper_destroy(dri2_surf->wl_drm_wrapper);
dri2_surf->color_buffers[i].data_size);
}
- if (dri2_dpy->dri2) {
- for (int i = 0; i < __DRI_BUFFER_COUNT; i++)
- if (dri2_surf->dri_buffers[i] &&
- dri2_surf->dri_buffers[i]->attachment != __DRI_BUFFER_BACK_LEFT)
- dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen,
- dri2_surf->dri_buffers[i]);
- }
+ if (dri2_dpy->dri2)
+ dri2_egl_surface_free_local_buffers(dri2_surf);
if (dri2_surf->throttle_callback)
wl_callback_destroy(dri2_surf->throttle_callback);
if (dri2_surf->wl_win) {
- dri2_surf->wl_win->private = NULL;
+ dri2_surf->wl_win->driver_private = NULL;
dri2_surf->wl_win->resize_callback = NULL;
dri2_surf->wl_win->destroy_window_callback = NULL;
}
- if (dri2_surf->wl_drm_wrapper)
- wl_proxy_wrapper_destroy(dri2_surf->wl_drm_wrapper);
wl_proxy_wrapper_destroy(dri2_surf->wl_surface_wrapper);
wl_proxy_wrapper_destroy(dri2_surf->wl_dpy_wrapper);
+ if (dri2_surf->wl_drm_wrapper)
+ wl_proxy_wrapper_destroy(dri2_surf->wl_drm_wrapper);
wl_event_queue_destroy(dri2_surf->wl_queue);
+ dri2_fini_surface(surf);
free(surf);
return EGL_TRUE;
dri2_egl_display(dri2_surf->base.Resource.Display);
for (int i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
- if (dri2_surf->color_buffers[i].wl_buffer &&
- !dri2_surf->color_buffers[i].locked)
- wl_buffer_destroy(dri2_surf->color_buffers[i].wl_buffer);
+ if (dri2_surf->color_buffers[i].wl_buffer) {
+ if (dri2_surf->color_buffers[i].locked) {
+ dri2_surf->color_buffers[i].wl_release = true;
+ } else {
+ wl_buffer_destroy(dri2_surf->color_buffers[i].wl_buffer);
+ dri2_surf->color_buffers[i].wl_buffer = NULL;
+ }
+ }
if (dri2_surf->color_buffers[i].dri_image)
dri2_dpy->image->destroyImage(dri2_surf->color_buffers[i].dri_image);
if (dri2_surf->color_buffers[i].linear_copy)
munmap(dri2_surf->color_buffers[i].data,
dri2_surf->color_buffers[i].data_size);
- dri2_surf->color_buffers[i].wl_buffer = NULL;
dri2_surf->color_buffers[i].dri_image = NULL;
dri2_surf->color_buffers[i].linear_copy = NULL;
dri2_surf->color_buffers[i].data = NULL;
- dri2_surf->color_buffers[i].locked = false;
}
- if (dri2_dpy->dri2) {
- for (int i = 0; i < __DRI_BUFFER_COUNT; i++)
- if (dri2_surf->dri_buffers[i] &&
- dri2_surf->dri_buffers[i]->attachment != __DRI_BUFFER_BACK_LEFT)
- dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen,
- dri2_surf->dri_buffers[i]);
- }
+ if (dri2_dpy->dri2)
+ dri2_egl_surface_free_local_buffers(dri2_surf);
}
static int
struct dri2_egl_display *dri2_dpy =
dri2_egl_display(dri2_surf->base.Resource.Display);
int use_flags;
+ int visual_idx;
unsigned int dri_image_format;
+ unsigned int linear_dri_image_format;
uint64_t *modifiers;
int num_modifiers;
- /* currently supports three WL DRM formats,
- * WL_DRM_FORMAT_ARGB8888, WL_DRM_FORMAT_XRGB8888,
- * and WL_DRM_FORMAT_RGB565
+ visual_idx = dri2_wl_visual_idx_from_fourcc(dri2_surf->format);
+ assert(visual_idx != -1);
+ dri_image_format = dri2_wl_visuals[visual_idx].dri_image_format;
+ linear_dri_image_format = dri_image_format;
+ modifiers = u_vector_tail(&dri2_dpy->wl_modifiers[visual_idx]);
+ num_modifiers = u_vector_length(&dri2_dpy->wl_modifiers[visual_idx]);
+
+ /* Substitute dri image format if server does not support original format */
+ if (!(dri2_dpy->formats & (1 << visual_idx)))
+ linear_dri_image_format = dri2_wl_visuals[visual_idx].alt_dri_image_format;
+
+ /* These asserts hold, as long as dri2_wl_visuals[] is self-consistent and
+ * the PRIME substitution logic in dri2_wl_add_configs_for_visuals() is free
+ * of bugs.
*/
- switch (dri2_surf->format) {
- case WL_DRM_FORMAT_ARGB8888:
- dri_image_format = __DRI_IMAGE_FORMAT_ARGB8888;
- modifiers = u_vector_tail(&dri2_dpy->wl_modifiers.argb8888);
- num_modifiers = u_vector_length(&dri2_dpy->wl_modifiers.argb8888);
- break;
- case WL_DRM_FORMAT_XRGB8888:
- dri_image_format = __DRI_IMAGE_FORMAT_XRGB8888;
- modifiers = u_vector_tail(&dri2_dpy->wl_modifiers.xrgb8888);
- num_modifiers = u_vector_length(&dri2_dpy->wl_modifiers.xrgb8888);
- break;
- case WL_DRM_FORMAT_RGB565:
- dri_image_format = __DRI_IMAGE_FORMAT_RGB565;
- modifiers = u_vector_tail(&dri2_dpy->wl_modifiers.rgb565);
- num_modifiers = u_vector_length(&dri2_dpy->wl_modifiers.rgb565);
- break;
- default:
- /* format is not supported */
- return -1;
- }
+ assert(linear_dri_image_format != __DRI_IMAGE_FORMAT_NONE);
+ assert(dri2_dpy->formats &
+ (1 << dri2_wl_visual_idx_from_dri_image_format(linear_dri_image_format)));
/* There might be a buffer release already queued that wasn't processed */
wl_display_dispatch_queue_pending(dri2_dpy->wl_dpy, dri2_surf->wl_queue);
while (dri2_surf->back == NULL) {
for (int i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
- /* Get an unlocked buffer, preferrably one with a dri_buffer
+ /* Get an unlocked buffer, preferably one with a dri_buffer
* already allocated. */
if (dri2_surf->color_buffers[i].locked)
continue;
break;
/* If we don't have a buffer, then block on the server to release one for
- * us, and try again. */
- if (wl_display_dispatch_queue(dri2_dpy->wl_dpy, dri2_surf->wl_queue) < 0)
+ * us, and try again. wl_display_dispatch_queue will process any pending
+ * events, however not all servers flush on issuing a buffer release
+ * event. So, we spam the server with roundtrips as they always cause a
+ * client flush.
+ */
+ if (wl_display_roundtrip_queue(dri2_dpy->wl_dpy,
+ dri2_surf->wl_queue) < 0)
return -1;
}
dri2_dpy->image->createImageWithModifiers(dri2_dpy->dri_screen,
dri2_surf->base.Width,
dri2_surf->base.Height,
- dri_image_format,
+ linear_dri_image_format,
&linear_mod,
1,
NULL);
dri2_dpy->image->createImage(dri2_dpy->dri_screen,
dri2_surf->base.Width,
dri2_surf->base.Height,
- dri_image_format,
+ linear_dri_image_format,
use_flags |
__DRI_IMAGE_USE_LINEAR,
NULL);
buffer->flags = 0;
}
-static int
-get_aux_bo(struct dri2_egl_surface *dri2_surf,
- unsigned int attachment, unsigned int format, __DRIbuffer *buffer)
-{
- struct dri2_egl_display *dri2_dpy =
- dri2_egl_display(dri2_surf->base.Resource.Display);
- __DRIbuffer *b = dri2_surf->dri_buffers[attachment];
-
- if (b == NULL) {
- b = dri2_dpy->dri2->allocateBuffer(dri2_dpy->dri_screen,
- attachment, format,
- dri2_surf->base.Width,
- dri2_surf->base.Height);
- dri2_surf->dri_buffers[attachment] = b;
- }
- if (b == NULL)
- return -1;
-
- memcpy(buffer, b, sizeof *buffer);
-
- return 0;
-}
-
static int
update_buffers(struct dri2_egl_surface *dri2_surf)
{
if (dri2_surf->base.Width != dri2_surf->wl_win->width ||
dri2_surf->base.Height != dri2_surf->wl_win->height) {
- dri2_wl_release_buffers(dri2_surf);
-
dri2_surf->base.Width = dri2_surf->wl_win->width;
dri2_surf->base.Height = dri2_surf->wl_win->height;
dri2_surf->dx = dri2_surf->wl_win->dx;
dri2_surf->dy = dri2_surf->wl_win->dy;
}
+ if (dri2_surf->base.Width != dri2_surf->wl_win->attached_width ||
+ dri2_surf->base.Height != dri2_surf->wl_win->attached_height) {
+ dri2_wl_release_buffers(dri2_surf);
+ }
+
if (get_back_bo(dri2_surf) < 0) {
_eglError(EGL_BAD_ALLOC, "failed to allocate color buffer");
return -1;
return 0;
}
+static int
+update_buffers_if_needed(struct dri2_egl_surface *dri2_surf)
+{
+ if (dri2_surf->back != NULL)
+ return 0;
+
+ return update_buffers(dri2_surf);
+}
+
static __DRIbuffer *
dri2_wl_get_buffers_with_format(__DRIdrawable * driDrawable,
int *width, int *height,
return NULL;
for (i = 0, j = 0; i < 2 * count; i += 2, j++) {
+ __DRIbuffer *local;
+
switch (attachments[i]) {
case __DRI_BUFFER_BACK_LEFT:
back_bo_to_dri_buffer(dri2_surf, &dri2_surf->buffers[j]);
break;
default:
- if (get_aux_bo(dri2_surf, attachments[i], attachments[i + 1],
- &dri2_surf->buffers[j]) < 0) {
- _eglError(EGL_BAD_ALLOC, "failed to allocate aux buffer");
+ local = dri2_egl_surface_alloc_local_buffer(dri2_surf, attachments[i],
+ attachments[i + 1]);
+
+ if (!local) {
+ _eglError(EGL_BAD_ALLOC, "failed to allocate local buffer");
return NULL;
}
+ dri2_surf->buffers[j] = *local;
break;
}
}
struct dri2_egl_surface *dri2_surf = loaderPrivate;
unsigned int *attachments_with_format;
__DRIbuffer *buffer;
- unsigned int bpp;
-
- switch (dri2_surf->format) {
- case WL_DRM_FORMAT_ARGB8888:
- case WL_DRM_FORMAT_XRGB8888:
- bpp = 32;
- break;
- case WL_DRM_FORMAT_RGB565:
- bpp = 16;
- break;
- default:
- /* format is not supported */
+ int visual_idx = dri2_wl_visual_idx_from_fourcc(dri2_surf->format);
+
+ if (visual_idx == -1)
return NULL;
- }
attachments_with_format = calloc(count, 2 * sizeof(unsigned int));
if (!attachments_with_format) {
for (int i = 0; i < count; ++i) {
attachments_with_format[2*i] = attachments[i];
- attachments_with_format[2*i + 1] = bpp;
+ attachments_with_format[2*i + 1] = dri2_wl_visuals[visual_idx].bpp;
}
buffer =
.done = wayland_throttle_callback
};
+static EGLBoolean
+get_fourcc(struct dri2_egl_display *dri2_dpy,
+ __DRIimage *image, int *fourcc)
+{
+ EGLBoolean query;
+ int dri_format;
+ int visual_idx;
+
+ query = dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_FOURCC,
+ fourcc);
+ if (query)
+ return true;
+
+ query = dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_FORMAT,
+ &dri_format);
+ if (!query)
+ return false;
+
+ visual_idx = dri2_wl_visual_idx_from_dri_image_format(dri_format);
+ if (visual_idx == -1)
+ return false;
+
+ *fourcc = dri2_wl_visuals[visual_idx].wl_drm_format;
+ return true;
+}
+
static struct wl_buffer *
create_wl_buffer(struct dri2_egl_display *dri2_dpy,
struct dri2_egl_surface *dri2_surf,
__DRIimage *image)
{
struct wl_buffer *ret;
+ EGLBoolean query;
int width, height, fourcc, num_planes;
+ uint64_t modifier = DRM_FORMAT_MOD_INVALID;
- dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_WIDTH, &width);
- dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_HEIGHT, &height);
- dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_FOURCC, &fourcc);
- dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_NUM_PLANES,
- &num_planes);
+ query = dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_WIDTH, &width);
+ query &= dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_HEIGHT,
+ &height);
+ query &= get_fourcc(dri2_dpy, image, &fourcc);
+ if (!query)
+ return NULL;
- if (dri2_dpy->wl_dmabuf && dri2_dpy->image->base.version >= 15) {
- struct zwp_linux_buffer_params_v1 *params;
+ query = dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_NUM_PLANES,
+ &num_planes);
+ if (!query)
+ num_planes = 1;
+
+ if (dri2_dpy->image->base.version >= 15) {
int mod_hi, mod_lo;
- int i;
- dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_MODIFIER_UPPER,
- &mod_hi);
- dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_MODIFIER_LOWER,
- &mod_lo);
+ query = dri2_dpy->image->queryImage(image,
+ __DRI_IMAGE_ATTRIB_MODIFIER_UPPER,
+ &mod_hi);
+ query &= dri2_dpy->image->queryImage(image,
+ __DRI_IMAGE_ATTRIB_MODIFIER_LOWER,
+ &mod_lo);
+ if (query) {
+ modifier = combine_u32_into_u64(mod_hi, mod_lo);
+ }
+ }
+
+ if (dri2_dpy->wl_dmabuf && modifier != DRM_FORMAT_MOD_INVALID) {
+ struct zwp_linux_buffer_params_v1 *params;
+ int i;
/* We don't need a wrapper for wl_dmabuf objects, because we have to
* create the intermediate params object; we can set the queue on this,
for (i = 0; i < num_planes; i++) {
__DRIimage *p_image;
- int stride, offset, fd;
+ int stride, offset;
+ int fd = -1;
- if (i == 0)
- p_image = image;
- else
- p_image = dri2_dpy->image->fromPlanar(image, i, NULL);
+ p_image = dri2_dpy->image->fromPlanar(image, i, NULL);
if (!p_image) {
- zwp_linux_buffer_params_v1_destroy(params);
- return NULL;
+ assert(i == 0);
+ p_image = image;
}
- dri2_dpy->image->queryImage(p_image, __DRI_IMAGE_ATTRIB_FD, &fd);
- dri2_dpy->image->queryImage(p_image, __DRI_IMAGE_ATTRIB_STRIDE,
- &stride);
- dri2_dpy->image->queryImage(p_image, __DRI_IMAGE_ATTRIB_OFFSET,
- &offset);
+ query = dri2_dpy->image->queryImage(p_image,
+ __DRI_IMAGE_ATTRIB_FD,
+ &fd);
+ query &= dri2_dpy->image->queryImage(p_image,
+ __DRI_IMAGE_ATTRIB_STRIDE,
+ &stride);
+ query &= dri2_dpy->image->queryImage(p_image,
+ __DRI_IMAGE_ATTRIB_OFFSET,
+ &offset);
if (image != p_image)
dri2_dpy->image->destroyImage(p_image);
+ if (!query) {
+ if (fd >= 0)
+ close(fd);
+ zwp_linux_buffer_params_v1_destroy(params);
+ return NULL;
+ }
+
zwp_linux_buffer_params_v1_add(params, fd, i, offset, stride,
- mod_hi, mod_lo);
+ modifier >> 32, modifier & 0xffffffff);
close(fd);
}
/* Make sure we have a back buffer in case we're swapping without ever
* rendering. */
- if (get_back_bo(dri2_surf) < 0)
+ if (update_buffers_if_needed(dri2_surf) < 0)
return _eglError(EGL_BAD_ALLOC, "dri2_swap_buffers");
if (draw->SwapInterval > 0) {
dri2_surf->current->wl_buffer =
create_wl_buffer(dri2_dpy, dri2_surf, image);
+ dri2_surf->current->wl_release = false;
+
wl_buffer_add_listener(dri2_surf->current->wl_buffer,
&wl_buffer_listener, dri2_surf);
}
{
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface);
- if (get_back_bo(dri2_surf) < 0) {
+ if (update_buffers_if_needed(dri2_surf) < 0) {
_eglError(EGL_BAD_ALLOC, "dri2_query_buffer_age");
return -1;
}
static EGLBoolean
dri2_wl_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
{
- return dri2_wl_swap_buffers_with_damage (drv, disp, draw, NULL, 0);
+ return dri2_wl_swap_buffers_with_damage(drv, disp, draw, NULL, 0);
}
static struct wl_buffer *
struct dri2_egl_image *dri2_img = dri2_egl_image(img);
__DRIimage *image = dri2_img->dri_image;
struct wl_buffer *buffer;
- int format;
+ int format, visual_idx;
+ /* Check the upstream display supports this buffer's format. */
dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_FORMAT, &format);
- switch (format) {
- case __DRI_IMAGE_FORMAT_ARGB8888:
- if (!(dri2_dpy->formats & HAS_ARGB8888))
- goto bad_format;
- break;
- case __DRI_IMAGE_FORMAT_XRGB8888:
- if (!(dri2_dpy->formats & HAS_XRGB8888))
- goto bad_format;
- break;
- default:
+ visual_idx = dri2_wl_visual_idx_from_dri_image_format(format);
+ if (visual_idx == -1)
+ goto bad_format;
+
+ if (!(dri2_dpy->formats & (1u << visual_idx)))
goto bad_format;
- }
buffer = create_wl_buffer(dri2_dpy, NULL, image);
/* The buffer object will have been created with our internal event queue
- * because it is using the wl_drm object as a proxy factory. We want the
+ * because it is using wl_dmabuf/wl_drm as a proxy factory. We want the
* buffer to be used by the application so we'll reset it to the display's
* default event queue. This isn't actually racy, as the only event the
* buffer can get is a buffer release, which doesn't happen with an explicit
if (dri2_dpy->fd == -1) {
_eglLog(_EGL_WARNING, "wayland-egl: could not open %s (%s)",
dri2_dpy->device_name, strerror(errno));
+ free(dri2_dpy->device_name);
+ dri2_dpy->device_name = NULL;
return;
}
if (drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER) {
dri2_dpy->authenticated = true;
} else {
- drmGetMagic(dri2_dpy->fd, &magic);
+ if (drmGetMagic(dri2_dpy->fd, &magic)) {
+ close(dri2_dpy->fd);
+ dri2_dpy->fd = -1;
+ free(dri2_dpy->device_name);
+ dri2_dpy->device_name = NULL;
+ _eglLog(_EGL_WARNING, "wayland-egl: drmGetMagic failed");
+ return;
+ }
wl_drm_authenticate(dri2_dpy->wl_drm, magic);
}
}
drm_handle_format(void *data, struct wl_drm *drm, uint32_t format)
{
struct dri2_egl_display *dri2_dpy = data;
+ int visual_idx = dri2_wl_visual_idx_from_fourcc(format);
- switch (format) {
- case WL_DRM_FORMAT_ARGB8888:
- dri2_dpy->formats |= HAS_ARGB8888;
- break;
- case WL_DRM_FORMAT_XRGB8888:
- dri2_dpy->formats |= HAS_XRGB8888;
- break;
- case WL_DRM_FORMAT_RGB565:
- dri2_dpy->formats |= HAS_RGB565;
- break;
- }
+ if (visual_idx == -1)
+ return;
+
+ dri2_dpy->formats |= (1u << visual_idx);
}
static void
uint32_t modifier_lo)
{
struct dri2_egl_display *dri2_dpy = data;
- uint64_t *mod = NULL;
+ int visual_idx = dri2_wl_visual_idx_from_fourcc(format);
+ uint64_t *mod;
+
+ if (visual_idx == -1)
+ return;
if (modifier_hi == (DRM_FORMAT_MOD_INVALID >> 32) &&
modifier_lo == (DRM_FORMAT_MOD_INVALID & 0xffffffff))
return;
- switch (format) {
- case WL_DRM_FORMAT_ARGB8888:
- mod = u_vector_add(&dri2_dpy->wl_modifiers.argb8888);
- break;
- case WL_DRM_FORMAT_XRGB8888:
- mod = u_vector_add(&dri2_dpy->wl_modifiers.xrgb8888);
- break;
- case WL_DRM_FORMAT_RGB565:
- mod = u_vector_add(&dri2_dpy->wl_modifiers.rgb565);
- break;
- default:
- break;
- }
-
- if (!mod)
- return;
+ dri2_dpy->formats |= (1u << visual_idx);
- *mod = (uint64_t) modifier_hi << 32;
- *mod |= (uint64_t) (modifier_lo & 0xffffffff);
+ mod = u_vector_add(&dri2_dpy->wl_modifiers[visual_idx]);
+ *mod = combine_u32_into_u64(modifier_hi, modifier_lo);
}
static const struct zwp_linux_dmabuf_v1_listener dmabuf_listener = {
.global_remove = registry_handle_global_remove
};
-static EGLBoolean
-dri2_wl_swap_interval(_EGLDriver *drv,
- _EGLDisplay *disp,
- _EGLSurface *surf,
- EGLint interval)
-{
- if (interval > surf->Config->MaxSwapInterval)
- interval = surf->Config->MaxSwapInterval;
- else if (interval < surf->Config->MinSwapInterval)
- interval = surf->Config->MinSwapInterval;
-
- surf->SwapInterval = interval;
-
- return EGL_TRUE;
-}
-
static void
-dri2_wl_setup_swap_interval(struct dri2_egl_display *dri2_dpy)
+dri2_wl_setup_swap_interval(_EGLDisplay *disp)
{
- GLint vblank_mode = DRI_CONF_VBLANK_DEF_INTERVAL_1;
-
/* We can't use values greater than 1 on Wayland because we are using the
* frame callback to synchronise the frame and the only way we be sure to
* get a frame callback is to attach a new buffer. Therefore we can't just
* sit drawing nothing to wait until the next ‘n’ frame callbacks */
- if (dri2_dpy->config)
- dri2_dpy->config->configQueryi(dri2_dpy->dri_screen,
- "vblank_mode", &vblank_mode);
- switch (vblank_mode) {
- case DRI_CONF_VBLANK_NEVER:
- dri2_dpy->min_swap_interval = 0;
- dri2_dpy->max_swap_interval = 0;
- dri2_dpy->default_swap_interval = 0;
- break;
- case DRI_CONF_VBLANK_ALWAYS_SYNC:
- dri2_dpy->min_swap_interval = 1;
- dri2_dpy->max_swap_interval = 1;
- dri2_dpy->default_swap_interval = 1;
- break;
- case DRI_CONF_VBLANK_DEF_INTERVAL_0:
- dri2_dpy->min_swap_interval = 0;
- dri2_dpy->max_swap_interval = 1;
- dri2_dpy->default_swap_interval = 0;
- break;
- default:
- case DRI_CONF_VBLANK_DEF_INTERVAL_1:
- dri2_dpy->min_swap_interval = 0;
- dri2_dpy->max_swap_interval = 1;
- dri2_dpy->default_swap_interval = 1;
- break;
- }
+ dri2_setup_swap_interval(disp, 1);
}
static const struct dri2_egl_display_vtbl dri2_wl_display_vtbl = {
.create_pbuffer_surface = dri2_fallback_create_pbuffer_surface,
.destroy_surface = dri2_wl_destroy_surface,
.create_image = dri2_create_image_khr,
- .swap_interval = dri2_wl_swap_interval,
.swap_buffers = dri2_wl_swap_buffers,
.swap_buffers_with_damage = dri2_wl_swap_buffers_with_damage,
.swap_buffers_region = dri2_fallback_swap_buffers_region,
dri2_wl_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
- static const struct {
- const char *format_name;
- int has_format;
- unsigned int rgba_masks[4];
- } visuals[] = {
- { "XRGB8888", HAS_XRGB8888, { 0xff0000, 0xff00, 0x00ff, 0xff000000 } },
- { "ARGB8888", HAS_ARGB8888, { 0xff0000, 0xff00, 0x00ff, 0 } },
- { "RGB565", HAS_RGB565, { 0x00f800, 0x07e0, 0x001f, 0 } },
- };
- unsigned int format_count[ARRAY_SIZE(visuals)] = { 0 };
+ unsigned int format_count[ARRAY_SIZE(dri2_wl_visuals)] = { 0 };
unsigned int count = 0;
+ bool assigned;
for (unsigned i = 0; dri2_dpy->driver_configs[i]; i++) {
- for (unsigned j = 0; j < ARRAY_SIZE(visuals); j++) {
+ assigned = false;
+
+ for (unsigned j = 0; j < ARRAY_SIZE(dri2_wl_visuals); j++) {
struct dri2_egl_config *dri2_conf;
- if (!(dri2_dpy->formats & visuals[j].has_format))
+ if (!(dri2_dpy->formats & (1u << j)))
continue;
dri2_conf = dri2_add_config(disp, dri2_dpy->driver_configs[i],
- count + 1, EGL_WINDOW_BIT, NULL, visuals[j].rgba_masks);
+ count + 1, EGL_WINDOW_BIT, NULL, dri2_wl_visuals[j].rgba_masks);
if (dri2_conf) {
if (dri2_conf->base.ConfigID == count + 1)
count++;
format_count[j]++;
+ assigned = true;
+ }
+ }
+
+ if (!assigned && dri2_dpy->is_different_gpu) {
+ struct dri2_egl_config *dri2_conf;
+ int alt_dri_image_format, c, s;
+
+ /* No match for config. Try if we can blitImage convert to a visual */
+ c = dri2_wl_visual_idx_from_config(dri2_dpy,
+ dri2_dpy->driver_configs[i]);
+
+ if (c == -1)
+ continue;
+
+ /* Find optimal target visual for blitImage conversion, if any. */
+ alt_dri_image_format = dri2_wl_visuals[c].alt_dri_image_format;
+ s = dri2_wl_visual_idx_from_dri_image_format(alt_dri_image_format);
+
+ if (s == -1 || !(dri2_dpy->formats & (1 << s)))
+ continue;
+
+ /* Visual s works for the Wayland server, and c can be converted into s
+ * by our client gpu during PRIME blitImage conversion to a linear
+ * wl_buffer, so add visual c as supported by the client renderer.
+ */
+ dri2_conf = dri2_add_config(disp, dri2_dpy->driver_configs[i],
+ count + 1, EGL_WINDOW_BIT, NULL,
+ dri2_wl_visuals[c].rgba_masks);
+ if (dri2_conf) {
+ if (dri2_conf->base.ConfigID == count + 1)
+ count++;
+ format_count[c]++;
+ if (format_count[c] == 1)
+ _eglLog(_EGL_DEBUG, "Client format %s to server format %s via "
+ "PRIME blitImage.", dri2_wl_visuals[c].format_name,
+ dri2_wl_visuals[s].format_name);
}
}
}
for (unsigned i = 0; i < ARRAY_SIZE(format_count); i++) {
if (!format_count[i]) {
_eglLog(_EGL_DEBUG, "No DRI config supports native format %s",
- visuals[i].format_name);
+ dri2_wl_visuals[i].format_name);
}
}
static EGLBoolean
dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp)
{
+ _EGLDevice *dev;
struct dri2_egl_display *dri2_dpy;
- loader_set_logger(_eglLog);
-
dri2_dpy = calloc(1, sizeof *dri2_dpy);
if (!dri2_dpy)
return _eglError(EGL_BAD_ALLOC, "eglInitialize");
dri2_dpy->wl_dpy = disp->PlatformDisplay;
}
- if (!u_vector_init(&dri2_dpy->wl_modifiers.xrgb8888, sizeof(uint64_t), 32) ||
- !u_vector_init(&dri2_dpy->wl_modifiers.argb8888, sizeof(uint64_t), 32) ||
- !u_vector_init(&dri2_dpy->wl_modifiers.rgb565, sizeof(uint64_t), 32)) {
+ dri2_dpy->wl_modifiers =
+ calloc(ARRAY_SIZE(dri2_wl_visuals), sizeof(*dri2_dpy->wl_modifiers));
+ if (!dri2_dpy->wl_modifiers)
goto cleanup;
+ for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
+ if (!u_vector_init(&dri2_dpy->wl_modifiers[i], sizeof(uint64_t), 32))
+ goto cleanup;
}
dri2_dpy->wl_queue = wl_display_create_queue(dri2_dpy->wl_dpy);
dri2_dpy->fd = loader_get_user_preferred_fd(dri2_dpy->fd,
&dri2_dpy->is_different_gpu);
+ dev = _eglAddDevice(dri2_dpy->fd, false);
+ if (!dev) {
+ _eglError(EGL_NOT_INITIALIZED, "DRI2: failed to find EGLDevice");
+ goto cleanup;
+ }
+
+ disp->Device = dev;
+
if (dri2_dpy->is_different_gpu) {
free(dri2_dpy->device_name);
dri2_dpy->device_name = loader_get_device_name_for_fd(dri2_dpy->fd);
dri2_setup_screen(disp);
- dri2_wl_setup_swap_interval(dri2_dpy);
+ dri2_wl_setup_swap_interval(disp);
/* To use Prime, we must have _DRI_IMAGE v7 at least.
* createImageFromFds support indicates that Prime export/import
static int
dri2_wl_swrast_get_stride_for_format(int format, int w)
{
- if (format == WL_SHM_FORMAT_RGB565)
- return 2 * w;
- else /* ARGB8888 || XRGB8888 */
- return 4 * w;
+ int visual_idx = dri2_wl_visual_idx_from_shm_format(format);
+
+ assume(visual_idx != -1);
+
+ return w * (dri2_wl_visuals[visual_idx].bpp / 8);
}
/*
*
* If the C library implements posix_fallocate(), it is used to
* guarantee that disk space is available for the file at the
- * given size. If disk space is insufficent, errno is set to ENOSPC.
+ * given size. If disk space is insufficient, errno is set to ENOSPC.
* If posix_fallocate() is not supported, program may receive
* SIGBUS on accessing mmap()'ed file contents instead.
*/
static int
os_create_anonymous_file(off_t size)
{
- static const char template[] = "/mesa-shared-XXXXXX";
+ static const char templ[] = "/mesa-shared-XXXXXX";
const char *path;
char *name;
int fd;
return -1;
}
- name = malloc(strlen(path) + sizeof(template));
+ name = malloc(strlen(path) + sizeof(templ));
if (!name)
return -1;
strcpy(name, path);
- strcat(name, template);
+ strcat(name, templ);
fd = create_tmpfile_cloexec(name);
stride = dri2_wl_swrast_get_stride_for_format(format, w);
size_map = h * stride;
- /* Create a sharable buffer */
+ /* Create a shareable buffer */
fd = os_create_anonymous_file(size_map);
if (fd < 0)
return EGL_FALSE;
* handle the commit and send a release event before checking for a free
* buffer */
if (dri2_surf->throttle_callback == NULL) {
- dri2_surf->throttle_callback = wl_display_sync(dri2_dpy->wl_dpy_wrapper);
+ dri2_surf->throttle_callback = wl_display_sync(dri2_surf->wl_dpy_wrapper);
wl_callback_add_listener(dri2_surf->throttle_callback,
&throttle_listener, dri2_surf);
}
shm_handle_format(void *data, struct wl_shm *shm, uint32_t format)
{
struct dri2_egl_display *dri2_dpy = data;
+ int visual_idx = dri2_wl_visual_idx_from_shm_format(format);
- switch (format) {
- case WL_SHM_FORMAT_ARGB8888:
- dri2_dpy->formats |= HAS_ARGB8888;
- break;
- case WL_SHM_FORMAT_XRGB8888:
- dri2_dpy->formats |= HAS_XRGB8888;
- break;
- case WL_SHM_FORMAT_RGB565:
- dri2_dpy->formats |= HAS_RGB565;
- break;
- }
+ if (visual_idx == -1)
+ return;
+
+ dri2_dpy->formats |= (1u << visual_idx);
}
static const struct wl_shm_listener shm_listener = {
.create_pixmap_surface = dri2_wl_create_pixmap_surface,
.create_pbuffer_surface = dri2_fallback_create_pbuffer_surface,
.destroy_surface = dri2_wl_destroy_surface,
- .create_image = dri2_fallback_create_image_khr,
- .swap_interval = dri2_wl_swap_interval,
+ .create_image = dri2_create_image_khr,
.swap_buffers = dri2_wl_swrast_swap_buffers,
.swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage,
.swap_buffers_region = dri2_fallback_swap_buffers_region,
static const __DRIextension *swrast_loader_extensions[] = {
&swrast_loader_extension.base,
+ &image_lookup_extension.base,
NULL,
};
static EGLBoolean
dri2_initialize_wayland_swrast(_EGLDriver *drv, _EGLDisplay *disp)
{
+ _EGLDevice *dev;
struct dri2_egl_display *dri2_dpy;
- loader_set_logger(_eglLog);
-
dri2_dpy = calloc(1, sizeof *dri2_dpy);
if (!dri2_dpy)
return _eglError(EGL_BAD_ALLOC, "eglInitialize");
dri2_dpy->wl_dpy = disp->PlatformDisplay;
}
+ dev = _eglAddDevice(dri2_dpy->fd, true);
+ if (!dev) {
+ _eglError(EGL_NOT_INITIALIZED, "DRI2: failed to find EGLDevice");
+ goto cleanup;
+ }
+
+ disp->Device = dev;
+
dri2_dpy->wl_queue = wl_display_create_queue(dri2_dpy->wl_dpy);
dri2_dpy->wl_dpy_wrapper = wl_proxy_create_wrapper(dri2_dpy->wl_dpy);
dri2_setup_screen(disp);
- dri2_wl_setup_swap_interval(dri2_dpy);
+ dri2_wl_setup_swap_interval(disp);
if (!dri2_wl_add_configs_for_visuals(drv, disp)) {
_eglError(EGL_NOT_INITIALIZED, "DRI2: failed to add configs");
EGLBoolean
dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
{
- EGLBoolean initialized = EGL_TRUE;
+ EGLBoolean initialized = EGL_FALSE;
- int hw_accel = (getenv("LIBGL_ALWAYS_SOFTWARE") == NULL);
+ if (!disp->Options.ForceSoftware)
+ initialized = dri2_initialize_wayland_drm(drv, disp);
- if (hw_accel) {
- if (!dri2_initialize_wayland_drm(drv, disp)) {
- initialized = dri2_initialize_wayland_swrast(drv, disp);
- }
- } else {
+ if (!initialized)
initialized = dri2_initialize_wayland_swrast(drv, disp);
- }
return initialized;
}
+
+void
+dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy)
+{
+ if (dri2_dpy->wl_drm)
+ wl_drm_destroy(dri2_dpy->wl_drm);
+ if (dri2_dpy->wl_dmabuf)
+ zwp_linux_dmabuf_v1_destroy(dri2_dpy->wl_dmabuf);
+ if (dri2_dpy->wl_shm)
+ wl_shm_destroy(dri2_dpy->wl_shm);
+ if (dri2_dpy->wl_registry)
+ wl_registry_destroy(dri2_dpy->wl_registry);
+ if (dri2_dpy->wl_queue)
+ wl_event_queue_destroy(dri2_dpy->wl_queue);
+ if (dri2_dpy->wl_dpy_wrapper)
+ wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
+
+ for (int i = 0; dri2_dpy->wl_modifiers && i < ARRAY_SIZE(dri2_wl_visuals); i++)
+ u_vector_finish(&dri2_dpy->wl_modifiers[i]);
+ free(dri2_dpy->wl_modifiers);
+
+ if (dri2_dpy->own_device)
+ wl_display_disconnect(dri2_dpy->wl_dpy);
+}
projects / mesa.git / blobdiff