mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: split EGL and GL info logging

Browse Source 
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>
This commit is contained in:
Emil Velikov
2018-10-18 15:55:28 +01:00
committed by Emil Velikov
parent 7e2d4beb08
commit 3bb047b605
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/gl-renderer.c
+9 -2
View File
@@ -2845,7 +2845,7 @@ log_extensions(const char *name, const char *extensions)
} }
static void static void
log_egl_gl_info(EGLDisplay egldpy) log_egl_info(EGLDisplay egldpy)
{ {
const char *str; const char *str;
@@ -2860,6 +2860,12 @@ log_egl_gl_info(EGLDisplay egldpy)
str = eglQueryString(egldpy, EGL_EXTENSIONS); str = eglQueryString(egldpy, EGL_EXTENSIONS);
log_extensions("EGL extensions", str ? str : "(null)"); log_extensions("EGL extensions", str ? str : "(null)");
}
static void
log_gl_info(void)
{
const char *str;
str = (char *)glGetString(GL_VERSION); str = (char *)glGetString(GL_VERSION);
weston_log("GL version: %s\n", str ? str : "(null)"); 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); 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 = gr->image_target_texture_2d =
(void *) eglGetProcAddress("glEGLImageTargetTexture2DOES"); (void *) eglGetProcAddress("glEGLImageTargetTexture2DOES");