Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ui/egl: export qemu_egl_get_error_string()
It will be used from other units.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230606115658.677673-2-marcandre.lureau@redhat.com>
  • Loading branch information
elmarco committed Jun 27, 2023
1 parent 2fc2807 commit 044ca4b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 2 additions & 0 deletions include/ui/egl-helpers.h
Expand Up @@ -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 */
12 changes: 5 additions & 7 deletions ui/egl-helpers.c
Expand Up @@ -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();

Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 044ca4b

Please sign in to comment.