haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenGL: Fix SetSwapInterval logic. 

- Don't use GLX extension functions unless they are supported on the
connection. GLEW only checks for client library support.

- Don't try to set swap interval using glXSwapIntervalSGI when vsync is
not requested.

Fixes https://gitlab.com/kicad/code/kicad/issues/11751

(cherry picked from commit 0e2d3236b5)
This commit is contained in:
Alex 2022-06-07 22:33:28 +03:00 committed by Seth Hillbrand
parent 064a9688c0
commit 33027b8f66
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
include/gl_utils.h
View File

@ -24,7 +24,7 @@
#ifndef GL_UTILS_H #ifndef GL_UTILS_H
#define GL_UTILS_H #define GL_UTILS_H
#include <gal/opengl/kiglew.h> // Must be included first #include <gal/opengl/kiglew.h> // Must be included first
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
#include <wx/utils.h> #include <wx/utils.h>
@ -45,62 +45,63 @@ public:
/// Windows would include <wglext.h> and call wglSwapIntervalEXT /// Windows would include <wglext.h> and call wglSwapIntervalEXT
#if defined( __linux__ ) && !defined( KICAD_USE_EGL ) #if defined( __linux__ ) && !defined( KICAD_USE_EGL )
Display *dpy = glXGetCurrentDisplay(); if( Display* dpy = glXGetCurrentDisplay() )
GLXDrawable drawable = glXGetCurrentDrawable();
std::string vendor( reinterpret_cast<const char*>( glGetString( GL_VENDOR ) ) );
bool is_mesa = ( vendor.find( "Mesa" ) != std::string::npos );
if( !is_mesa && glXSwapIntervalEXT && glXQueryDrawable && dpy && drawable )
{ {
GLXDrawable drawable = glXGetCurrentDrawable();
std::string exts( glXQueryExtensionsString( dpy, DefaultScreen( dpy ) ) ); std::string exts( glXQueryExtensionsString( dpy, DefaultScreen( dpy ) ) );
if( aVal < 0 ) if( glXSwapIntervalEXT && glXQueryDrawable && drawable
&& exts.find( "GLX_EXT_swap_control" ) != std::string::npos )
{ {
if( exts.find( "GLX_EXT_swap_control_tear" ) == std::string::npos ) if( aVal < 0 )
{ {
aVal = 0; if( exts.find( "GLX_EXT_swap_control_tear" ) == std::string::npos )
}
else
{
// Even though the extensions might be available,
// we need to be sure that late/adaptive swaps are
// enabled on the drawable.
unsigned lateSwapsEnabled = 0;
glXQueryDrawable( dpy, drawable, GLX_LATE_SWAPS_TEAR_EXT, &lateSwapsEnabled );
if( !lateSwapsEnabled )
{ {
aVal = 0; aVal = 0;
} }
else
{
// Even though the extensions might be available,
// we need to be sure that late/adaptive swaps are
// enabled on the drawable.
unsigned lateSwapsEnabled = 0;
glXQueryDrawable( dpy, drawable, GLX_LATE_SWAPS_TEAR_EXT,
&lateSwapsEnabled );
if( !lateSwapsEnabled )
{
aVal = 0;
}
}
} }
unsigned clampedInterval;
glXSwapIntervalEXT( dpy, drawable, aVal );
glXQueryDrawable( dpy, drawable, GLX_SWAP_INTERVAL_EXT, &clampedInterval );
return clampedInterval;
} }
unsigned clampedInterval; if( glXSwapIntervalMESA && glXGetSwapIntervalMESA
glXSwapIntervalEXT( dpy, drawable, aVal ); && exts.find( "GLX_MESA_swap_control" ) != std::string::npos )
glXQueryDrawable( dpy, drawable, GLX_SWAP_INTERVAL_EXT, &clampedInterval ); {
if( aVal < 0 )
aVal = 0;
return clampedInterval; glXSwapIntervalMESA( aVal );
} return glXGetSwapIntervalMESA();
}
if( glXSwapIntervalMESA &&glXGetSwapIntervalMESA ) if( aVal > 0 && glXSwapIntervalSGI
{ && exts.find( "GLX_SGI_swap_control" ) != std::string::npos )
if( aVal < 0 ) {
aVal = 0; if( glXSwapIntervalSGI( aVal ) )
glXSwapIntervalSGI( 1 );
glXSwapIntervalMESA( aVal ); return 1;
return glXGetSwapIntervalMESA(); }
}
if( glXSwapIntervalSGI )
{
if( aVal < 1 )
aVal = 1;
if( glXSwapIntervalSGI( aVal ) )
glXSwapIntervalSGI( 1 );
return 1;
} }
return std::numeric_limits<int>::max(); return std::numeric_limits<int>::max();
@ -111,4 +112,3 @@ public:
}; };
#endif /* GL_CONTEXT_MANAGER_H */ #endif /* GL_CONTEXT_MANAGER_H */