yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct glGetGraphicsResetStatus()

Browse source 
KWin loads glGetGraphicsResetStatus() on its own to handle ARB and EXT
extensions. After moving graphics reset handling to the RenderBackend,
kwin doesn't use its own glGetGraphicsResetStatus() function, but instead
uses the one provided by libepoxy, which panics if
glGetGraphicsResetStatus() is not in core spec. This change makes the
OpenGLBackend use kwin's glGetGraphicsResetStatus() function instead of
the one provided by libepoxy to avoid a crash.
This commit is contained in:
Vlad Zahorodnii 2022-01-11 18:43:12 +02:00
parent d6002c2631
commit b4f2bc3898
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/platformsupport/scenes/opengl/openglbackend.cpp
View file

@ -9,13 +9,13 @@
*/
#include "openglbackend.h"
#include <kwineffects.h>
#include <kwinglutils_funcs.h>
#include "screens.h"
#include "utils.h"
#include <QElapsedTimer>
#include <epoxy/gl.h>
#include <unistd.h>
namespace KWin
@ -102,7 +102,7 @@ SurfaceTexture *OpenGLBackend::createSurfaceTextureWayland(SurfacePixmapWayland
bool OpenGLBackend::checkGraphicsReset()
{
const GLenum status = glGetGraphicsResetStatus();
const GLenum status = KWin::glGetGraphicsResetStatus();
if (Q_LIKELY(status == GL_NO_ERROR)) {
return false;
}
@ -125,7 +125,7 @@ bool OpenGLBackend::checkGraphicsReset()
timer.start();
// Wait until the reset is completed or max 10 seconds
while (timer.elapsed() < 10000 && glGetGraphicsResetStatus() != GL_NO_ERROR) {
while (timer.elapsed() < 10000 && KWin::glGetGraphicsResetStatus() != GL_NO_ERROR) {
usleep(50);
}