Use std::optional instead of mbgl::optional (#911)

This commit is contained in:
Bart Louwers
2023-03-17 12:51:59 +01:00
committed by GitHub
parent 36846439c6
commit 15ad65dd3d
482 changed files with 2605 additions and 2652 deletions

View File

@@ -6,6 +6,7 @@
#include <EGL/egl.h>
#include <cassert>
#include <sstream>
namespace mbgl {
namespace gl {
@@ -30,8 +31,8 @@ public:
}
if (!eglBindAPI(EGL_OPENGL_ES_API)) {
mbgl::Log::Error(mbgl::Event::OpenGL, "eglBindAPI(EGL_OPENGL_ES_API) returned error %d",
eglGetError());
mbgl::Log::Error(mbgl::Event::OpenGL, "eglBindAPI(EGL_OPENGL_ES_API) returned error " +
std::to_string(eglGetError()));
throw std::runtime_error("eglBindAPI() failed");
}
@@ -82,8 +83,10 @@ public:
eglContext = eglCreateContext(eglDisplay->display, eglDisplay->config, EGL_NO_CONTEXT, attribs);
if (eglContext == EGL_NO_CONTEXT) {
mbgl::Log::Error(mbgl::Event::OpenGL, "eglCreateContext() returned error 0x%04x",
eglGetError());
std::ostringstream logMsg;
logMsg << "eglCreateContext() returned error 0x" << std::hex << eglGetError();
mbgl::Log::Error(mbgl::Event::OpenGL, logMsg.str());
throw std::runtime_error("Error creating the EGL context object.\n");
}