diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-29 15:32:48 +0200 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-29 10:17:47 -0700 |
| commit | cc78b74098e02311cc646fe5b82c13641ff705fa (patch) | |
| tree | af0219d5611f0984bf3b244a336fbc6074a44cb4 /include/mbgl | |
| parent | 15aece8a30dcc1f1f97e28180edda46d05641a2d (diff) | |
| download | qtlocation-mapboxgl-cc78b74098e02311cc646fe5b82c13641ff705fa.tar.gz | |
[core] remove dependence on gl.h types
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/gl/gl.hpp | 5 | ||||
| -rw-r--r-- | include/mbgl/map/mode.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/platform/default/glfw_view.hpp | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/include/mbgl/gl/gl.hpp b/include/mbgl/gl/gl.hpp index aa03c48f7f..c849a935c2 100644 --- a/include/mbgl/gl/gl.hpp +++ b/include/mbgl/gl/gl.hpp @@ -86,8 +86,3 @@ extern ExtensionFunction<void (GLsizei n, GLuint* arrays)> } // namespace gl } // namespace mbgl - -#ifdef GL_ES_VERSION_2_0 - #define glClearDepth glClearDepthf - #define glDepthRange glDepthRangef -#endif diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp index 2efc8b18e0..afec5c0a08 100644 --- a/include/mbgl/map/mode.hpp +++ b/include/mbgl/map/mode.hpp @@ -45,10 +45,10 @@ enum class MapDebugOptions : EnumType { Collision = 1 << 4, Overdraw = 1 << 5, // FIXME: https://github.com/mapbox/mapbox-gl-native/issues/5117 -#ifndef GL_ES_VERSION_2_0 +#if not MBGL_USE_GLES2 StencilClip = 1 << 6, DepthBuffer = 1 << 7, -#endif // GL_ES_VERSION_2_0 +#endif // MBGL_USE_GLES2 }; constexpr MapDebugOptions operator|(MapDebugOptions lhs, MapDebugOptions rhs) { diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp index 38ab922414..b352709830 100644 --- a/include/mbgl/platform/default/glfw_view.hpp +++ b/include/mbgl/platform/default/glfw_view.hpp @@ -5,7 +5,7 @@ #include <mbgl/util/timer.hpp> #include <mbgl/util/geometry.hpp> -#ifdef MBGL_USE_GLES2 +#if MBGL_USE_GLES2 #define GLFW_INCLUDE_ES2 #endif #define GL_GLEXT_PROTOTYPES |