From: Marc-André Lureau Date: Tue, 6 Jun 2023 11:56:38 +0000 (+0400) Subject: ui/egl: export qemu_egl_get_error_string() X-Git-Tag: v8.1.0~87^2~20 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=044ca4bf45b5bc232a2d699a9e63f359b1b85df6;p=mirror_qemu.git ui/egl: export qemu_egl_get_error_string() It will be used from other units. Signed-off-by: Marc-André Lureau Message-Id: <20230606115658.677673-2-marcandre.lureau@redhat.com> --- diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index 53d953ddf4..2cf6633ad2 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -67,4 +67,6 @@ bool qemu_egl_has_dmabuf(void); bool egl_init(const char *rendernode, DisplayGLMode mode, Error **errp); +const char *qemu_egl_get_error_string(void); + #endif /* EGL_HELPERS_H */ diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 60385c1f48..26d43e0213 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -28,8 +28,7 @@ DisplayGLMode qemu_egl_mode; /* ------------------------------------------------------------------ */ -#if defined(CONFIG_X11) || defined(CONFIG_GBM) -static const char *egl_get_error_string(void) +const char *qemu_egl_get_error_string(void) { EGLint error = eglGetError(); @@ -68,7 +67,6 @@ static const char *egl_get_error_string(void) return "Unknown EGL error"; } } -#endif static void egl_fb_delete_texture(egl_fb *fb) { @@ -480,20 +478,20 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy, qemu_egl_display = qemu_egl_get_display(dpy, platform); if (qemu_egl_display == EGL_NO_DISPLAY) { - error_report("egl: eglGetDisplay failed: %s", egl_get_error_string()); + error_report("egl: eglGetDisplay failed: %s", qemu_egl_get_error_string()); return -1; } b = eglInitialize(qemu_egl_display, &major, &minor); if (b == EGL_FALSE) { - error_report("egl: eglInitialize failed: %s", egl_get_error_string()); + error_report("egl: eglInitialize failed: %s", qemu_egl_get_error_string()); return -1; } b = eglBindAPI(gles ? EGL_OPENGL_ES_API : EGL_OPENGL_API); if (b == EGL_FALSE) { error_report("egl: eglBindAPI failed (%s mode): %s", - gles ? "gles" : "core", egl_get_error_string()); + gles ? "gles" : "core", qemu_egl_get_error_string()); return -1; } @@ -502,7 +500,7 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy, &qemu_egl_config, 1, &n); if (b == EGL_FALSE || n != 1) { error_report("egl: eglChooseConfig failed (%s mode): %s", - gles ? "gles" : "core", egl_get_error_string()); + gles ? "gles" : "core", qemu_egl_get_error_string()); return -1; }