diff --git a/CMakeLists.txt b/CMakeLists.txt index a767693bd9..583ea9e711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -661,7 +661,7 @@ else() if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(FindGLEW) endif() - if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS) + if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_10_METHODS) message("Using static GLEW from Externals") add_subdirectory(Externals/GLew) include_directories(Externals/GLew/include) diff --git a/CMakeTests/FindGLEW.cmake b/CMakeTests/FindGLEW.cmake index 4861292558..c91048e362 100644 --- a/CMakeTests/FindGLEW.cmake +++ b/CMakeTests/FindGLEW.cmake @@ -10,13 +10,14 @@ macro(test_glew) #include int main() { - #ifdef GLEW_ARB_shader_image_load_store + #ifdef GLEW_ARB_buffer_storage return 0; #else return 1; #endif }" - GLEW_HAS_1_9_METHODS) + GLEW_HAS_1_10_METHODS) + endmacro() if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND) @@ -25,7 +26,7 @@ endif() if(GLEW_FOUND) test_glew() - if (GLEW_HAS_1_9_METHODS) + if (GLEW_HAS_1_10_METHODS) include_directories(${GLEW_INCLUDE_DIRS}) message("GLEW found") endif() diff --git a/Source/Core/VideoBackends/OGL/Src/Render.cpp b/Source/Core/VideoBackends/OGL/Src/Render.cpp index 694301b6f8..b2b5687047 100644 --- a/Source/Core/VideoBackends/OGL/Src/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Src/Render.cpp @@ -547,7 +547,7 @@ Renderer::Renderer() g_ogl_config.gl_renderer, g_ogl_config.gl_version), 5000); - WARN_LOG(VIDEO,"Missing OGL Extensions: %s%s%s%s%s%s%s%s%s%s", + WARN_LOG(VIDEO,"Missing OGL Extensions: %s%s%s%s%s%s%s%s%s%s%s", g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ", g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "UniformBuffer ", g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ",