diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp index be07ba50e..4a2e4099a 100644 --- a/android/cpp/native_map_view.cpp +++ b/android/cpp/native_map_view.cpp @@ -610,15 +610,6 @@ void loadExtensions() { assert(gl::IsVertexArray != nullptr); } - if (extensions.find("GL_OES_packed_depth_stencil") != std::string::npos) { - mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_OES_packed_depth_stencil."); - gl::isPackedDepthStencilSupported = true; - } - - if (extensions.find("GL_OES_depth24") != std::string::npos) { - gl::isDepth24Supported = true; - } - if (extensions.find("GL_KHR_debug") != std::string::npos) { mbgl::Log::Info(mbgl::Event::OpenGL, "Using GL_KHR_debug."); gl::DebugMessageControl = reinterpret_cast( diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp index 78f5ba087..1b842b080 100644 --- a/include/mbgl/platform/gl.hpp +++ b/include/mbgl/platform/gl.hpp @@ -144,14 +144,6 @@ extern PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays; extern PFNGLGENVERTEXARRAYSPROC GenVertexArrays; extern PFNGLISVERTEXARRAYPROC IsVertexArray; -// GL_EXT_packed_depth_stencil / GL_OES_packed_depth_stencil -extern bool isPackedDepthStencilSupported; -#define GL_DEPTH24_STENCIL8 0x88F0 - -// GL_OES_depth24 -extern bool isDepth24Supported; -#define GL_DEPTH_COMPONENT24 0x81A6 - // Debug group markers, useful for debugging on iOS #if defined(DEBUG) // static int indent = 0; diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index 789d2d4b6..fa27c0880 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -142,10 +142,6 @@ GLFWView::GLFWView(bool fullscreen_) : fullscreen(fullscreen_) { assert(gl::GenVertexArrays != nullptr); assert(gl::IsVertexArray != nullptr); } - - // Require packed depth stencil - gl::isPackedDepthStencilSupported = true; - gl::isDepth24Supported = true; }); glfwMakeContextCurrent(nullptr); diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp index 35c796e92..41584b9a9 100644 --- a/platform/default/headless_view.cpp +++ b/platform/default/headless_view.cpp @@ -95,10 +95,6 @@ void HeadlessView::loadExtensions() { #endif }); - // HeadlessView requires packed depth stencil - gl::isPackedDepthStencilSupported = true; - gl::isDepth24Supported = true; - extensionsLoaded = true; } diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index c928dd6ae..72f2d420c 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -251,14 +251,6 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) gl::PushGroupMarkerEXT = glPushGroupMarkerEXT; gl::PopGroupMarkerEXT = glPopGroupMarkerEXT; } - - if (extensions.find("GL_OES_packed_depth_stencil") != std::string::npos) { - gl::isPackedDepthStencilSupported = YES; - } - - if (extensions.find("GL_OES_depth24") != std::string::npos) { - gl::isDepth24Supported = YES; - } }); // setup mbgl map diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/platform/gl.cpp index b18ca3da2..096ec8393 100644 --- a/src/mbgl/platform/gl.cpp +++ b/src/mbgl/platform/gl.cpp @@ -70,10 +70,6 @@ PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays = nullptr; PFNGLGENVERTEXARRAYSPROC GenVertexArrays = nullptr; PFNGLISVERTEXARRAYPROC IsVertexArray = nullptr; -bool isPackedDepthStencilSupported = false; - -bool isDepth24Supported = false; - void checkError(const char *cmd, const char *file, int line) { const GLenum err = glGetError(); if (err != GL_NO_ERROR) {