diff options
| author | Andrei Karas <akaras@inbox.ru> | 2020-05-30 06:13:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2020-05-30 06:13:34 +0300 |
| commit | 2715ed0cadbe5a0d83a0cf810f70916a897f03c4 (patch) | |
| tree | 6a14cf9a0b9a848a7f7399ec8ac46e928297a881 | |
| parent | 14d64cf0785ae8786df86b4a32652cc426251691 (diff) | |
| download | manaplus-2715ed0cadbe5a0d83a0cf810f70916a897f03c4.tar.gz manaplus-2715ed0cadbe5a0d83a0cf810f70916a897f03c4.tar.bz2 manaplus-2715ed0cadbe5a0d83a0cf810f70916a897f03c4.tar.xz manaplus-2715ed0cadbe5a0d83a0cf810f70916a897f03c4.zip | |
Disable warning conditionally-supported for opengl function pointers
| -rw-r--r-- | src/graphicsmanager.cpp | 9 | ||||
| -rw-r--r-- | src/render/openglx/mglxinit.cpp | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index f45439937..3173e3ce0 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -650,7 +650,10 @@ 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); @@ -1032,10 +1035,13 @@ 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")) { @@ -1059,6 +1065,8 @@ void GraphicsManager::initOpenGLFunctions() 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 || @@ -1396,6 +1404,7 @@ void GraphicsManager::initOpenGLFunctions() #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 d83872871..23e1553c2 100644 --- a/src/render/openglx/mglxinit.cpp +++ b/src/render/openglx/mglxinit.cpp @@ -34,6 +34,8 @@ void Glx::initFunctions() { +PRAGMA49(GCC diagnostic push) +PRAGMA49(GCC diagnostic ignored "-Wconditionally-supported") assignFunction(glXCreateContext) assignFunction(glXGetCurrentContext) assignFunctionARB(glXCreateContextAttribs) @@ -41,6 +43,7 @@ void Glx::initFunctions() assignFunction(glXDestroyContext) assignFunction(glXMakeCurrent) assignFunction(glXSwapBuffers) +PRAGMA49(GCC diagnostic pop) } #endif // defined(USE_OPENGL) && defined(USE_X11) |