From 118c7ba3b15990e09329a35b76270006dc4f5ae0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 30 May 2020 08:00:54 +0300
Subject: Revert "Disable warning conditionally-supported for opengl function
 pointers"

This reverts commit 2715ed0cadbe5a0d83a0cf810f70916a897f03c4.
---
 src/graphicsmanager.cpp         | 9 ---------
 src/render/openglx/mglxinit.cpp | 3 ---
 2 files changed, 12 deletions(-)

diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 3173e3ce0..f45439937 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -650,10 +650,7 @@ void GraphicsManager::updateExtensions()
     logger->log1("opengl extensions: ");
     if (checkGLVersion(3, 0))
     {   // get extensions in new way
-PRAGMA49(GCC diagnostic push)
-PRAGMA49(GCC diagnostic ignored "-Wconditionally-supported")
         assignFunction2(glGetStringi, "glGetStringi")
-PRAGMA49(GCC diagnostic pop)
         std::string extList;
         int num = 0;
         glGetIntegerv(GL_NUM_EXTENSIONS, &num);
@@ -1035,13 +1032,10 @@ void GraphicsManager::initOpenGLFunctions()
     if (is10 && (is33 || supportExtension("GL_ARB_sampler_objects")))
     {
         logger->log1("found GL_ARB_sampler_objects");
-PRAGMA49(GCC diagnostic push)
-PRAGMA49(GCC diagnostic ignored "-Wconditionally-supported")
         assignFunction(glGenSamplers)
         assignFunction(glDeleteSamplers)
         assignFunction(glBindSampler)
         assignFunction(glSamplerParameteri)
-PRAGMA49(GCC diagnostic pop)
         if (isGLNotNull(mglGenSamplers)
             && config.getBoolValue("useTextureSampler"))
         {
@@ -1065,8 +1059,6 @@ PRAGMA49(GCC diagnostic pop)
         return;
     }
 
-PRAGMA49(GCC diagnostic push)
-PRAGMA49(GCC diagnostic ignored "-Wconditionally-supported")
 /*
     if (findI(mGlVendor, "NVIDIA") != std::string::npos ||
         mGlVersionString.find("Mesa 10.6.") != std::string::npos ||
@@ -1404,7 +1396,6 @@ PRAGMA49(GCC diagnostic ignored "-Wconditionally-supported")
 #ifdef WIN32
     assignFunctionARB(wglGetExtensionsString)
 #endif  // WIN32
-PRAGMA49(GCC diagnostic pop)
 #endif  // __native_client__
 }
 
diff --git a/src/render/openglx/mglxinit.cpp b/src/render/openglx/mglxinit.cpp
index 23e1553c2..d83872871 100644
--- a/src/render/openglx/mglxinit.cpp
+++ b/src/render/openglx/mglxinit.cpp
@@ -34,8 +34,6 @@
 
 void Glx::initFunctions()
 {
-PRAGMA49(GCC diagnostic push)
-PRAGMA49(GCC diagnostic ignored "-Wconditionally-supported")
     assignFunction(glXCreateContext)
     assignFunction(glXGetCurrentContext)
     assignFunctionARB(glXCreateContextAttribs)
@@ -43,7 +41,6 @@ PRAGMA49(GCC diagnostic ignored "-Wconditionally-supported")
     assignFunction(glXDestroyContext)
     assignFunction(glXMakeCurrent)
     assignFunction(glXSwapBuffers)
-PRAGMA49(GCC diagnostic pop)
 }
 
 #endif  // defined(USE_OPENGL) && defined(USE_X11)
-- 
cgit v1.2.3-60-g2f50