From patchwork Mon Mar 13 09:27:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 738052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vhXbc005Pz9ryr for ; Mon, 13 Mar 2017 20:28:11 +1100 (AEDT) Received: from localhost ([::1]:51011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnMGv-0000xL-Fz for incoming@patchwork.ozlabs.org; Mon, 13 Mar 2017 05:28:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnMGS-0000vs-IV for qemu-devel@nongnu.org; Mon, 13 Mar 2017 05:27:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnMGP-0001RN-Ah for qemu-devel@nongnu.org; Mon, 13 Mar 2017 05:27:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnMGP-0001RI-11 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 05:27:37 -0400 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31FEF20264 for ; Mon, 13 Mar 2017 09:27:37 +0000 (UTC) Received: from shalem.localdomain (ovpn-116-138.ams2.redhat.com [10.36.116.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D47B52D5C1; Mon, 13 Mar 2017 09:27:35 +0000 (UTC) From: Hans de Goede To: Frediano Ziglio , Gerd Hoffmann References: <20170220095055.4234-1-fziglio@redhat.com> Message-ID: Date: Mon, 13 Mar 2017 10:27:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170220095055.4234-1-fziglio@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 13 Mar 2017 09:27:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH] egl-helpers: Support newer MESA versions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , qemu-devel@nongnu.org, Cole Robinson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Hi, On 20-02-17 10:50, Frediano Ziglio wrote: > According to > https://www.khronos.org/registry/EGL/extensions/MESA/EGL_MESA_platform_gbm.txt > if MESA_platform_gbm is supported display should be initialized > from a GBM handle using eglGetPlatformDisplayEXT. > > Signed-off-by: Frediano Ziglio > --- > This should fix > http://www.spinics.net/linux/fedora/libvir/msg142837.html > > Tested on Fedora rawhide. > --- > ui/egl-helpers.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c > index cd24568..964c5a5 100644 > --- a/ui/egl-helpers.c > +++ b/ui/egl-helpers.c > @@ -219,7 +219,11 @@ int qemu_egl_init_dpy(EGLNativeDisplayType dpy, bool gles, bool debug) > } > > egl_dbg("eglGetDisplay (dpy %p) ...\n", dpy); > +#ifdef EGL_MESA_platform_gbm > + qemu_egl_display = eglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_MESA, dpy, NULL); > +#else > qemu_egl_display = eglGetDisplay(dpy); > +#endif > if (qemu_egl_display == EGL_NO_DISPLAY) { > error_report("egl: eglGetDisplay failed"); > return -1; > That fix is incomplete, you need some magic to work properly on older libGL versions. Attached is a (compile tested only) proper patch. I do not have a qemu git clone handy atm, so this is not a git format-patch patch, it is against the Fedora Rawhide srpm. I've a test build with these patches here: https://fedorapeople.org/~jwrdegoede/qemu-glvnd/ I was planning on doing a git clone qemu and send a proper patch after I got some testing feedback. Feel free to use this as a base for a v2 of your patch. Regards, Hans diff -up qemu-2.8.0/ui/egl-helpers.c~ qemu-2.8.0/ui/egl-helpers.c --- qemu-2.8.0/ui/egl-helpers.c~ 2016-12-20 21:16:54.000000000 +0100 +++ qemu-2.8.0/ui/egl-helpers.c 2017-03-13 08:56:32.402845087 +0100 @@ -172,6 +172,50 @@ EGLSurface qemu_egl_init_surface_x11(EGL /* ---------------------------------------------------------------------- */ +/* + * Taken from glamor_egl.h from the Xorg xserver, which is MIT licensed + * + * Create an EGLDisplay from a native display type. This is a little quirky + * for a few reasons. + * + * 1: GetPlatformDisplayEXT and GetPlatformDisplay are the API you want to + * use, but have different function signatures in the third argument; this + * happens not to matter for us, at the moment, but it means epoxy won't alias + * them together. + * + * 2: epoxy 1.3 and earlier don't understand EGL client extensions, which + * means you can't call "eglGetPlatformDisplayEXT" directly, as the resolver + * will crash. + * + * 3: You can't tell whether you have EGL 1.5 at this point, because + * eglQueryString(EGL_VERSION) is a property of the display, which we don't + * have yet. So you have to query for extensions no matter what. Fortunately + * epoxy_has_egl_extension _does_ let you query for client extensions, so + * we don't have to write our own extension string parsing. + * + * 4. There is no EGL_KHR_platform_base to complement the EXT one, thus one + * needs to know EGL 1.5 is supported in order to use the eglGetPlatformDisplay + * function pointer. + * We can workaround this (circular dependency) by probing for the EGL 1.5 + * platform extensions (EGL_KHR_platform_gbm and friends) yet it doesn't seem + * like mesa will be able to adverise these (even though it can do EGL 1.5). + */ +static EGLDisplay qemu_egl_get_display(EGLint type, void *native) +{ + EGLDisplay dpy = NULL; + + /* In practise any EGL 1.5 implementation would support the EXT extension */ + if (epoxy_has_egl_extension(NULL, "EGL_EXT_platform_base")) { + PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT = + (void *) eglGetProcAddress("eglGetPlatformDisplayEXT"); + if (getPlatformDisplayEXT) + return getPlatformDisplayEXT(type, native, NULL); + } + + /* Welp, everything is awful. */ + return eglGetDisplay(native); +} + int qemu_egl_init_dpy(EGLNativeDisplayType dpy, bool gles, bool debug) { static const EGLint conf_att_gl[] = { @@ -202,8 +246,8 @@ int qemu_egl_init_dpy(EGLNativeDisplayTy setenv("LIBGL_DEBUG", "verbose", true); } - egl_dbg("eglGetDisplay (dpy %p) ...\n", dpy); - qemu_egl_display = eglGetDisplay(dpy); + egl_dbg("qemu_egl_get_display (dpy %p) ...\n", dpy); + qemu_egl_display = qemu_egl_get_display(EGL_PLATFORM_GBM_MESA, dpy); if (qemu_egl_display == EGL_NO_DISPLAY) { error_report("egl: eglGetDisplay failed"); return -1;