[plasma/kwin/Plasma/6.7] src/opengl: opengl/eglcontext: remove makeCurrent(EGLSurface)
Xaver Hugl <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 084fd39826ab50de78799b19d8e8634fdcfdb4c6 by Xaver Hugl.
Committed on 10/08/2026 at 14:23.
Pushed by zamundaaa into branch 'Plasma/6.7'.
opengl/eglcontext: remove makeCurrent(EGLSurface)
We don't use EGL surfaces in KWin
(cherry picked from commit 4b7d54ebd99d4c949ae65baef828d2790f6aa3fa)
M +1 -6 src/opengl/eglcontext.cpp
M +0 -1 src/opengl/eglcontext.h
https://invent.kde.org/plasma/kwin/-/commit/084fd39826ab50de78799b19d8e8634fdcfdb4c6
diff --git a/src/opengl/eglcontext.cpp b/src/opengl/eglcontext.cpp
index 0f1e20a9ee9..7f50187bbab 100644
--- a/src/opengl/eglcontext.cpp
+++ b/src/opengl/eglcontext.cpp
@@ -167,17 +167,12 @@ EglContext::~EglContext()
}
bool EglContext::makeCurrent()
-{
- return makeCurrent(EGL_NO_SURFACE);
-}
-
-bool EglContext::makeCurrent(EGLSurface surface)
{
if (QOpenGLContext *context = QOpenGLContext::currentContext()) {
// Workaround to tell Qt that no QOpenGLContext is current
context->doneCurrent();
}
- const bool ret = eglMakeCurrent(m_display->handle(), surface, surface, m_handle) == EGL_TRUE;
+ const bool ret = eglMakeCurrent(m_display->handle(), EGL_NO_SURFACE, EGL_NO_SURFACE, m_handle) == EGL_TRUE;
if (ret) {
Q_ASSERT(m_handle != EGL_NO_CONTEXT);
Q_ASSERT(eglGetCurrentContext() == m_handle);
diff --git a/src/opengl/eglcontext.h b/src/opengl/eglcontext.h
index 8cf32f25d69..ed2f1bad836 100644
--- a/src/opengl/eglcontext.h
+++ b/src/opengl/eglcontext.h
@@ -42,7 +42,6 @@ public:
~EglContext();
[[nodiscard]] bool makeCurrent();
- bool makeCurrent(EGLSurface surface);
void doneCurrent() const;
std::shared_ptr<GLTexture> importDmaBufAsTexture(const DmaBufAttributes &attributes) const;