tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[linux] Ensure EGL uses OpenGL ES 2.0 client API

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2016-11-11 16:37:44 +02:00
parent 0ef52d7f7c
commit ad38ff230b
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/linux/src/headless_backend_egl.cpp
View File

@@ -58,11 +58,16 @@ void HeadlessBackend::createContext() {
EGLDisplay display_ = display->attribute<EGLDisplay>();
EGLConfig& config = display->attribute<EGLConfig&>();
if (!eglBindAPI(EGL_OPENGL_API)) {
throw std::runtime_error("Error setting the EGL rendering API.\n");
}
// EGL initializes the context client version to 1 by default. We want to
// use OpenGL ES 2.0 which has the ability to create shader and program
// objects and also to write vertex and fragment shaders in the OpenGL ES
// Shading Language.
const EGLint attribs[] = {
EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_NONE
};
EGLContext glContext = eglCreateContext(display_, config, EGL_NO_CONTEXT, NULL);
EGLContext glContext = eglCreateContext(display_, config, EGL_NO_CONTEXT, attribs);
if (glContext == EGL_NO_CONTEXT) {
mbgl::Log::Error(mbgl::Event::OpenGL, "eglCreateContext() returned error 0x%04x",
eglGetError());

6
platform/linux/src/headless_display_egl.cpp
View File

@@ -1,4 +1,5 @@
#include <mbgl/platform/default/headless_display.hpp>
#include <mbgl/platform/log.hpp>
#include <mbgl/util/string.hpp>
#include <EGL/egl.h>
@@ -25,6 +26,11 @@ HeadlessDisplay::Impl::Impl() {
throw std::runtime_error("eglInitialize() failed.\n");
}
if (!eglBindAPI(EGL_OPENGL_ES_API)) {
mbgl::Log::Error(mbgl::Event::OpenGL, "eglBindAPI(EGL_OPENGL_ES_API) returned error %d", eglGetError());
throw std::runtime_error("eglBindAPI() failed");
}
// This shouldn't matter as we're rendering to a framebuffer.
const EGLint attribs[] = { EGL_NONE };
if (!eglChooseConfig(display, attribs, &config, 1, &numConfigs) || numConfigs != 1) {