From f70f604e5b99062a24764716ccdeda64c36320be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Wed, 22 Mar 2017 14:56:43 +0100
Subject: [core] Privatize gl/gl.hpp

---
 platform/glfw/glfw_view.cpp      | 20 ++++++++++----------
 platform/glfw/glfw_view.hpp      |  1 -
 platform/macos/src/MGLMapView.mm |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'platform')

diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp
index e833478795..498b021bff 100644
--- a/platform/glfw/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -559,9 +559,9 @@ void showDebugImage(std::string name, const char *data, size_t width, size_t hei
     glfwGetFramebufferSize(debugWindow, &fbWidth, &fbHeight);
     float scale = static_cast<float>(fbWidth) / static_cast<float>(width);
 
-    MBGL_CHECK_ERROR(glPixelZoom(scale, -scale));
-    MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f));
-    MBGL_CHECK_ERROR(glDrawPixels(width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, data));
+    glPixelZoom(scale, -scale);
+    glRasterPos2f(-1.0f, 1.0f);
+    glDrawPixels(width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, data);
 
     glfwSwapBuffers(debugWindow);
 
@@ -591,13 +591,13 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth
     float xScale = static_cast<float>(fbWidth) / static_cast<float>(width);
     float yScale = static_cast<float>(fbHeight) / static_cast<float>(height);
 
-    MBGL_CHECK_ERROR(glClearColor(0.8, 0.8, 0.8, 1));
-    MBGL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT));
-    MBGL_CHECK_ERROR(glEnable(GL_BLEND));
-    MBGL_CHECK_ERROR(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
-    MBGL_CHECK_ERROR(glPixelZoom(xScale, -yScale));
-    MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f));
-    MBGL_CHECK_ERROR(glDrawPixels(width, height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, data));
+    glClearColor(0.8, 0.8, 0.8, 1);
+    glClear(GL_COLOR_BUFFER_BIT);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glPixelZoom(xScale, -yScale);
+    glRasterPos2f(-1.0f, 1.0f);
+    glDrawPixels(width, height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, data);
 
     glfwSwapBuffers(debugWindow);
 
diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp
index 1cadae2e0f..bc50eba819 100644
--- a/platform/glfw/glfw_view.hpp
+++ b/platform/glfw/glfw_view.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <mbgl/gl/gl.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/map/backend.hpp>
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 3bf3909c8e..49d7509fc7 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -28,7 +28,6 @@
 #import <mbgl/util/default_thread_pool.hpp>
 #import <mbgl/map/backend.hpp>
 #import <mbgl/map/backend_scope.hpp>
-#import <mbgl/gl/gl.hpp>
 #import <mbgl/sprite/sprite_image.hpp>
 #import <mbgl/storage/default_file_source.hpp>
 #import <mbgl/storage/network_status.hpp>
@@ -55,6 +54,7 @@
 #import "NSPredicate+MGLAdditions.h"
 
 #import <QuartzCore/QuartzCore.h>
+#import <OpenGL/gl.h>
 
 class MGLMapViewImpl;
 class MGLAnnotationContext;
@@ -2866,7 +2866,7 @@ public:
     }
 
     void updateAssumedState() override {
-        MBGL_CHECK_ERROR(glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo));
+        glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
         assumeFramebufferBinding(fbo);
         assumeViewportSize(nativeView.framebufferSize);
     }
-- 
cgit v1.2.1