<!-- This is the upstream QEMU issue tracker. If you are able to, it will greatly facilitate bug triage if you attempt to reproduce the problem with the latest qemu.git master built from source. See https://www.qemu.org/download/#source for instructions on how to do this. QEMU generally supports the last two releases advertised on https://www.qemu.org/. Problems with distro-packaged versions of QEMU older than this should be reported to the distribution instead. See https://www.qemu.org/contribute/report-a-bug/ for additional guidance. If this is a security issue, please consult https://www.qemu.org/contribute/security-process/ --> ## Host environment - Operating system: macOS <!-- Windows 10 21H1, Fedora 37, etc. --> - OS/kernel version: 26.4 <!-- For POSIX hosts, use `uname -a` --> - Architecture: ARM <!-- x86, ARM, s390x, etc. --> - QEMU version: 11.0.0 <!-- e.g. `qemu-system-x86_64 --version` --> <!-- Give the smallest, complete command line that exhibits the problem. If you are using libvirt, virsh, or vmm, you can likely find the QEMU command line arguments in /var/log/libvirt/qemu/$GUEST.log. --> ## Description of problem <!-- Describe the problem, including any error/crash messages seen. --> When compiling QEMU with GL support on macOS, it fails. ## Steps to reproduce 1. ./configure && make ## Additional information This is the error: ``` :info:build ../qemu-11.0.0/ui/egl-helpers.c:531:54: error: incompatible integer to pointer conversion passing 'EGLNativeDisplayType' (aka 'int') to parameter of type 'void *' [-Wint-conversion] :info:build 531 | dpy = eglGetPlatformDisplayEXT(platform, native, NULL); :info:build | ^~~~~~ :info:build 1 error generated. ``` It seems the code makes the assumption that EGLNativeDisplayType will be a pointer. On macOS, it is an int. EGLNativeDisplayType should only be used for the native display, not when passing a platform argument, in which case the native type for that platform is unknown and has a void* type. I also ran into another problem where the `GDK_WINDOWING_X11` ifdef is used in some places but not others (the current implementation assumes that if both GTK and X11 are found, then GTK would support X11). See this patch that resolves this issue: ```diff diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index acf993fcf..2a498c73d 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -3,6 +3,9 @@ #include <epoxy/gl.h> #include <epoxy/egl.h> +#ifdef CONFIG_X11 +#include <X11/Xlib.h> +#endif #ifdef CONFIG_GBM #include <gbm.h> #endif @@ -61,11 +64,12 @@ void egl_dmabuf_create_fence(QemuDmaBuf *dmabuf); EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win); -#if defined(CONFIG_X11) || defined(CONFIG_GBM) - -int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode); -int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode); +#ifdef CONFIG_X11 +int qemu_egl_init_dpy_x11(Display *dpy, DisplayGLMode mode); +#endif +#ifdef CONFIG_GBM +int qemu_egl_init_dpy_mesa(struct gbm_device *dpy, DisplayGLMode mode); #endif #ifdef WIN32 diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index e3f2872cc..4401798dc 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -247,8 +247,7 @@ int egl_rendernode_init(const char *rendernode, DisplayGLMode mode) goto err; } - rc = qemu_egl_init_dpy_mesa((EGLNativeDisplayType)qemu_egl_rn_gbm_dev, - mode); + rc = qemu_egl_init_dpy_mesa(qemu_egl_rn_gbm_dev, mode); if (rc != 0) { /* qemu_egl_init_dpy_mesa reports error */ goto err; @@ -520,7 +519,7 @@ EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win) * platform extensions (EGL_KHR_platform_gbm and friends) yet it doesn't seem * like mesa will be able to advertise these (even though it can do EGL 1.5). */ -static EGLDisplay qemu_egl_get_display(EGLNativeDisplayType native, +static EGLDisplay qemu_egl_get_display(void *native, EGLenum platform) { EGLDisplay dpy = EGL_NO_DISPLAY; @@ -534,12 +533,12 @@ static EGLDisplay qemu_egl_get_display(EGLNativeDisplayType native, if (dpy == EGL_NO_DISPLAY) { /* fallback */ - dpy = eglGetDisplay(native); + dpy = eglGetDisplay((EGLNativeDisplayType)native); } return dpy; } -static int qemu_egl_init_dpy(EGLNativeDisplayType dpy, +static int qemu_egl_init_dpy(void *dpy, EGLenum platform, DisplayGLMode mode) { @@ -600,8 +599,8 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy, #endif -#if defined(CONFIG_X11) || defined(CONFIG_GBM) -int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode) +#ifdef CONFIG_X11 +int qemu_egl_init_dpy_x11(Display *dpy, DisplayGLMode mode) { #ifdef EGL_KHR_platform_x11 return qemu_egl_init_dpy(dpy, EGL_PLATFORM_X11_KHR, mode); @@ -609,8 +608,10 @@ int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode) return qemu_egl_init_dpy(dpy, 0, mode); #endif } +#endif -int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode) +#ifdef CONFIG_GBM +int qemu_egl_init_dpy_mesa(struct gbm_device *dpy, DisplayGLMode mode) { #ifdef EGL_MESA_platform_gbm return qemu_egl_init_dpy(dpy, EGL_PLATFORM_GBM_MESA, mode); diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index fa8fe8970..8017c6a3f 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -46,6 +46,7 @@ static void gtk_egl_set_scanout_mode(VirtualConsole *vc, bool scanout) void gd_egl_init(VirtualConsole *vc) { +#ifdef GDK_WINDOWING_X11 GdkWindow *gdk_window = gtk_widget_get_window(vc->gfx.drawing_area); if (!gdk_window) { return; @@ -61,6 +62,7 @@ void gd_egl_init(VirtualConsole *vc) (vc->gfx.ectx, (EGLNativeWindowType)x11_window); assert(vc->gfx.esurface); +#endif } void gd_egl_draw(VirtualConsole *vc) @@ -417,6 +419,7 @@ void gd_egl_flush(DisplayChangeListener *dcl, void gtk_egl_init(DisplayGLMode mode) { +#ifdef GDK_WINDOWING_X11 GdkDisplay *gdk_display = gdk_display_get_default(); Display *x11_display = gdk_x11_display_get_xdisplay(gdk_display); @@ -425,6 +428,7 @@ void gtk_egl_init(DisplayGLMode mode) } display_opengl = 1; +#endif } int gd_egl_make_current(DisplayGLCtx *dgc, ``` <!-- The line below ensures that proper tags are added to the issue. Please do not remove it. -->