Module: Mesa Branch: 17.0 Commit: 4c3b89a45f106f8c254cea9ccdfaac7ee4293d29 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c3b89a45f106f8c254cea9ccdfaac7ee4293d29
Author: Emil Velikov <[email protected]> Date: Fri May 12 14:19:59 2017 +0100 egl/wayland: select the format based on the interface used Rather than misleadingly depending on DRI2 for the WL_DRM vs WL_SHM formats, use the wl_drm and wl_shm interface respectively. Fixes: a1727aa75ed ("egl/wayland: Don't use DRM format codes for SHM") Signed-off-by: Emil Velikov <[email protected]> (cherry picked from commit 6ef0fc400c690362b66add9c3533fae5f21d2cae) --- src/egl/drivers/dri2/platform_wayland.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 9ad0635004..e028267533 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -124,7 +124,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, if (!_eglInitSurface(&dri2_surf->base, disp, EGL_WINDOW_BIT, conf, attrib_list)) goto cleanup_surf; - if (dri2_dpy->dri2) { + if (dri2_dpy->wl_drm) { if (conf->RedSize == 5) dri2_surf->format = WL_DRM_FORMAT_RGB565; else if (conf->AlphaSize == 0) @@ -132,6 +132,7 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp, 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) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
