summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-11-09 11:15:10 +0100
committerKonstantin Käfer <mail@kkaefer.com>2016-11-14 10:25:48 +0100
commit35a66eb2bd9c5d0f1da3a90b1e44ba75114a800a (patch)
tree9401cad1b51826d2913bf50f81d9984ed36e6dec
parentedf40bb6d9f0ee3731f39de597ce9a167571ea5b (diff)
downloadqtlocation-mapboxgl-35a66eb2bd9c5d0f1da3a90b1e44ba75114a800a.tar.gz
[core] don't show OpenGL debug information on startup
-rw-r--r--src/mbgl/gl/extension.cpp26
1 files changed, 2 insertions, 24 deletions
diff --git a/src/mbgl/gl/extension.cpp b/src/mbgl/gl/extension.cpp
index 40a2096f4f..e6b4d9156e 100644
--- a/src/mbgl/gl/extension.cpp
+++ b/src/mbgl/gl/extension.cpp
@@ -1,6 +1,5 @@
#include <mbgl/gl/extension.hpp>
#include <mbgl/gl/gl.hpp>
-#include <mbgl/platform/log.hpp>
#include <mutex>
#include <string>
@@ -26,31 +25,10 @@ ExtensionFunctionBase::ExtensionFunctionBase(std::initializer_list<Probe> probes
static std::once_flag initializeExtensionsOnce;
-const char* getGLString(GLenum name) {
- return reinterpret_cast<const char*>(MBGL_CHECK_ERROR(glGetString(name)));
-}
-
void InitializeExtensions(glProc (*getProcAddress)(const char*)) {
std::call_once(initializeExtensionsOnce, [getProcAddress] {
-#ifndef NDEBUG
- if (const char* vendor = getGLString(GL_VENDOR)) {
- mbgl::Log::Info(mbgl::Event::OpenGL, "Vendor: %s", vendor);
- }
- if (const char* renderer = getGLString(GL_RENDERER)) {
- mbgl::Log::Info(mbgl::Event::OpenGL, "Renderer: %s", renderer);
- }
- if (const char* version = getGLString(GL_VERSION)) {
- mbgl::Log::Info(mbgl::Event::OpenGL, "Version: %s", version);
- }
- if (const char* shaderVersion = getGLString(GL_SHADING_LANGUAGE_VERSION)) {
- mbgl::Log::Info(mbgl::Event::OpenGL, "Shading Language Version: %s", shaderVersion);
- }
-#endif
-
- if (const char* extensions = getGLString(GL_EXTENSIONS)) {
-#ifndef NDEBUG
- mbgl::Log::Info(mbgl::Event::OpenGL, "Extensions: %s", extensions);
-#endif
+ if (const char* extensions =
+ reinterpret_cast<const char*>(MBGL_CHECK_ERROR(glGetString(GL_EXTENSIONS)))) {
for (auto fn : detail::extensionFunctions()) {
for (auto probe : fn.second) {
if (strstr(extensions, probe.first) != nullptr) {