From 3bb047b6057a367636e288152bab898a90679915 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 18 Oct 2018 15:55:28 +0100
Subject: [PATCH] libweston: split EGL and GL info logging
Split the two into separate functions. Former requires an initialized
EGL display, while the latter a current context.
We will use that distinction with the next patch.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
libweston/gl-renderer.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index b6f32737a2..afa08d6c91 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2845,7 +2845,7 @@ log_extensions(const char *name, const char *extensions)
}
static void
-log_egl_gl_info(EGLDisplay egldpy)
+log_egl_info(EGLDisplay egldpy)
{
const char *str;
@@ -2860,6 +2860,12 @@ log_egl_gl_info(EGLDisplay egldpy)
str = eglQueryString(egldpy, EGL_EXTENSIONS);
log_extensions("EGL extensions", str ? str : "(null)");
+}
+
+static void
+log_gl_info(void)
+{
+ const char *str;
str = (char *)glGetString(GL_VERSION);
weston_log("GL version: %s\n", str ? str : "(null)");
@@ -3735,7 +3741,8 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface)
gr->gl_version = GR_GL_VERSION(2, 0);
}
- log_egl_gl_info(gr->egl_display);
+ log_egl_info(gr->egl_display);
+ log_gl_info();
gr->image_target_texture_2d =
(void *) eglGetProcAddress("glEGLImageTargetTexture2DOES");
--
GitLab