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

Drop unused EGLSurface getter and setter in Platform

Browse source 
Besides being unused, we should avoid making OpenGL contexts current
against the EGLSurface of the first output because it's a slippery road
that may end up in leaking context-specific resources in the mid of a
compositing restart.
This commit is contained in:
Vlad Zahorodnii 2020-10-19 13:11:02 +03:00
parent 292335beac
commit 170c41681d
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platform.h
View file

@ -131,19 +131,6 @@ public:
* by rendering backends. * by rendering backends.
*/ */
void setSceneEglGlobalShareContext(EGLContext context); void setSceneEglGlobalShareContext(EGLContext context);
/**
* The first (in case of multiple) EGLSurface used by the compositing scene.
*/
EGLSurface sceneEglSurface() const {
return m_surface;
}
/**
* Sets the first @p surface used by the compositing scene.
* @see sceneEglSurface
*/
void setSceneEglSurface(EGLSurface surface) {
m_surface = surface;
}
/** /**
* The EglConfig used by the compositing scene. * The EglConfig used by the compositing scene.
@ -558,7 +545,6 @@ private:
EGLConfig m_eglConfig = nullptr; EGLConfig m_eglConfig = nullptr;
EGLContext m_context = EGL_NO_CONTEXT; EGLContext m_context = EGL_NO_CONTEXT;
EGLContext m_globalShareContext = EGL_NO_CONTEXT; EGLContext m_globalShareContext = EGL_NO_CONTEXT;
EGLSurface m_surface = EGL_NO_SURFACE;
int m_hideCursorCounter = 0; int m_hideCursorCounter = 0;
ColorCorrect::Manager *m_colorCorrect = nullptr; ColorCorrect::Manager *m_colorCorrect = nullptr;
bool m_supportsGammaControl = false; bool m_supportsGammaControl = false;

2
platformsupport/scenes/opengl/abstract_egl_backend.cpp
View file

@ -118,7 +118,6 @@ void AbstractEglBackend::cleanup()
cleanupSurfaces(); cleanupSurfaces();
eglReleaseThread(); eglReleaseThread();
kwinApp()->platform()->setSceneEglContext(EGL_NO_CONTEXT); kwinApp()->platform()->setSceneEglContext(EGL_NO_CONTEXT);
kwinApp()->platform()->setSceneEglSurface(EGL_NO_SURFACE);
kwinApp()->platform()->setSceneEglConfig(nullptr); kwinApp()->platform()->setSceneEglConfig(nullptr);
} }
@ -359,7 +358,6 @@ void AbstractEglBackend::setConfig(const EGLConfig &config)
void AbstractEglBackend::setSurface(const EGLSurface &surface) void AbstractEglBackend::setSurface(const EGLSurface &surface)
{ {
m_surface = surface; m_surface = surface;
kwinApp()->platform()->setSceneEglSurface(surface);
} }
QSharedPointer<GLTexture> AbstractEglBackend::textureForOutput(AbstractOutput *requestedOutput) const QSharedPointer<GLTexture> AbstractEglBackend::textureForOutput(AbstractOutput *requestedOutput) const