aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
Diffstat (limited to 'render')
-rw-r--r--render/egl.c23
-rw-r--r--render/gles2/renderer.c5
2 files changed, 14 insertions, 14 deletions
diff --git a/render/egl.c b/render/egl.c
index e582b6d3..f2966774 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -2,7 +2,6 @@
#include <stdio.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
#include <stdlib.h>
#include <wlr/render/egl.h>
#include <wlr/util/log.h>
@@ -155,32 +154,28 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
}
eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl->context);
- egl->egl_exts_str = eglQueryString(egl->display, EGL_EXTENSIONS);
- egl->gl_exts_str = (const char*) glGetString(GL_EXTENSIONS);
+ egl->exts_str = eglQueryString(egl->display, EGL_EXTENSIONS);
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, "Supported EGL extensions: %s", 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 (!check_egl_ext(egl->egl_exts_str, "EGL_WL_bind_wayland_display") ||
- !check_egl_ext(egl->egl_exts_str, "EGL_KHR_image_base")) {
+ if (!check_egl_ext(egl->exts_str, "EGL_WL_bind_wayland_display") ||
+ !check_egl_ext(egl->exts_str, "EGL_KHR_image_base")) {
wlr_log(L_ERROR, "Required egl extensions not supported");
goto error;
}
egl->egl_exts.buffer_age =
- check_egl_ext(egl->egl_exts_str, "EGL_EXT_buffer_age");
+ check_egl_ext(egl->exts_str, "EGL_EXT_buffer_age");
egl->egl_exts.swap_buffers_with_damage =
- check_egl_ext(egl->egl_exts_str, "EGL_EXT_swap_buffers_with_damage") ||
- check_egl_ext(egl->egl_exts_str, "EGL_KHR_swap_buffers_with_damage");
+ check_egl_ext(egl->exts_str, "EGL_EXT_swap_buffers_with_damage") ||
+ check_egl_ext(egl->exts_str, "EGL_KHR_swap_buffers_with_damage");
egl->egl_exts.dmabuf_import =
- check_egl_ext(egl->egl_exts_str, "EGL_EXT_image_dma_buf_import");
+ check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import");
egl->egl_exts.dmabuf_import_modifiers =
- check_egl_ext(egl->egl_exts_str, "EGL_EXT_image_dma_buf_import_modifiers")
+ check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import_modifiers")
&& eglQueryDmaBufFormatsEXT && eglQueryDmaBufModifiersEXT;
print_dmabuf_formats(egl);
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index 61665a07..36a62aa7 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -377,6 +377,11 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend) {
renderer->egl = wlr_backend_get_egl(backend);
wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL);
+ renderer->exts_str = (const char*) glGetString(GL_EXTENSIONS);
+ wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION));
+ wlr_log(L_INFO, "GL vendor: %s", glGetString(GL_VENDOR));
+ wlr_log(L_INFO, "Supported GLES2 extensions: %s", renderer->exts_str);
+
if (glDebugMessageCallbackKHR && glDebugMessageControlKHR) {
glEnable(GL_DEBUG_OUTPUT_KHR);
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR);