diff --git a/gfx/drivers_shader/shader_gl_core.cpp b/gfx/drivers_shader/shader_gl_core.cpp
index b2d2f0ce13..2b908fb615 100644
--- a/gfx/drivers_shader/shader_gl_core.cpp
+++ b/gfx/drivers_shader/shader_gl_core.cpp
@@ -1947,7 +1947,7 @@ bool gl_core_filter_chain::init_history()
       original_history.emplace_back(new gl_core::Framebuffer(0, 1));
    }
 
-   RARCH_LOG("[GLCore]: Using history of %u frames.\n", required_images);
+   RARCH_LOG("[GLCore]: Using history of %u frames.\n", unsigned(required_images));
 
    /* On first frame, we need to clear the textures to
     * a known state, but we need
diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp
index 5e36f7627e..0578522351 100644
--- a/gfx/drivers_shader/shader_vulkan.cpp
+++ b/gfx/drivers_shader/shader_vulkan.cpp
@@ -761,7 +761,7 @@ bool vulkan_filter_chain::init_history()
                max_input_size, original_format, 1));
    }
 
-   RARCH_LOG("[Vulkan filter chain]: Using history of %u frames.\n", required_images);
+   RARCH_LOG("[Vulkan filter chain]: Using history of %u frames.\n", unsigned(required_images));
 
    /* On first frame, we need to clear the textures to
     * a known state, but we need
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index bf15541e26..b5558a5c60 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -478,6 +478,7 @@ check_lib '' STRCASESTR "$CLIB" strcasestr
 check_lib '' MMAP "$CLIB" mmap
 
 check_enabled CXX VULKAN vulkan 'The C++ compiler is' false
+check_enabled CXX OPENGL_CORE 'OpenGL core' 'The C++ compiler is' false
 check_enabled THREADS VULKAN vulkan 'Threads are' false
 
 if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then
diff --git a/qb/config.params.sh b/qb/config.params.sh
index ddb5000217..4a54468ce8 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -58,6 +58,7 @@ C89_D3D12=no
 HAVE_D3DX=yes              # Direct3DX support
 HAVE_OPENGL=auto           # OpenGL 2.0 support
 HAVE_OPENGL_CORE=yes       # Modern OpenGL driver support (GLES3+/GL3.2 core+), requires OpenGL.
+C89_OPENGL_CORE=no
 HAVE_OPENGL1=no            # OpenGL 1.1 support
 HAVE_MALI_FBDEV=no         # Mali fbdev context support
 HAVE_VIVANTE_FBDEV=no      # Vivante fbdev context support