diff options
| author | emersion <contact@emersion.fr> | 2018-02-16 18:25:58 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-02-16 18:25:58 +0100 |
| commit | 717bdccb6e07dd74227bdc6827b814f7144957e0 (patch) | |
| tree | 80e5166324f8b89f75aea480f557e7c96400576b /render | |
| parent | 56ab3e9b10fdaaf41eef6e47f81ffe54fd9d5a77 (diff) | |
| parent | 8c1cc45c7db9be4b49ffb27541e908f492fd59ba (diff) | |
| download | wlroots-717bdccb6e07dd74227bdc6827b814f7144957e0.tar.xz | |
Merge remote-tracking branch 'upstream/master' into martinetd/xdg_shell
Diffstat (limited to 'render')
| -rw-r--r-- | render/egl.c | 2 | ||||
| -rw-r--r-- | render/meson.build | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/render/egl.c b/render/egl.c index f1208a72..21c446f1 100644 --- a/render/egl.c +++ b/render/egl.c @@ -132,7 +132,9 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display, wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor); wlr_log(L_INFO, "Supported EGL extensions: %s", egl->egl_exts_str); + wlr_log(L_INFO, "EGL vendor: %s", eglQueryString(egl->display, EGL_VENDOR)); wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION)); + wlr_log(L_INFO, "GL vendor: %s", glGetString(GL_VENDOR)); wlr_log(L_INFO, "Supported OpenGL ES extensions: %s", egl->gl_exts_str); if (strstr(egl->egl_exts_str, "EGL_WL_bind_wayland_display") == NULL || diff --git a/render/meson.build b/render/meson.build index 1a5a85b8..8aa70cea 100644 --- a/render/meson.build +++ b/render/meson.build @@ -22,7 +22,7 @@ lib_wlr_render = static_library( glapi[0], glapi[1], include_directories: wlr_inc, - dependencies: [glesv2, egl, pixman], + dependencies: [egl, glesv2, pixman, wayland_server], ) wlr_render = declare_dependency( |