Skip to content

Commit 9168bc6

Browse files
stamphoQt Cherry-pick Bot
authored andcommitted
Remove leftover QOffscreenSurface from EGLHelper
Amends 2ed5f96 Create EGLImage with eglCreateDRMImageMESA() for exporting dma_buf Task-number: QTBUG-136257 Change-Id: Ice4f4d58edaa7de6a55b2a621e930393803eb869 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit bcee2db) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2c15c76)
1 parent 54af90a commit 9168bc6

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

src/core/ozone/egl_helper.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
#include "ozone_util_qt.h"
66
#include "web_engine_context.h"
77

8-
#include <QtCore/qthread.h>
98
#include <QtGui/qguiapplication.h>
10-
#include <QtGui/qoffscreensurface.h>
119
#include <QtGui/qopenglcontext.h>
1210
#include <QtGui/qopenglfunctions.h>
1311
#include <qpa/qplatformnativeinterface.h>
@@ -94,7 +92,6 @@ EGLHelper *EGLHelper::instance()
9492
EGLHelper::EGLHelper()
9593
: m_eglDisplay(qApp->platformNativeInterface()->nativeResourceForIntegration("egldisplay"))
9694
, m_functions(new EGLHelper::EGLFunctions())
97-
, m_offscreenSurface(new QOffscreenSurface())
9895
{
9996
const char *extensions = m_functions->eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
10097
if (!extensions) {
@@ -112,9 +109,6 @@ EGLHelper::EGLHelper()
112109
return;
113110
}
114111

115-
Q_ASSERT(QThread::currentThread() == qApp->thread());
116-
m_offscreenSurface->create();
117-
118112
m_isDmaBufSupported = QtWebEngineCore::WebEngineContext::isGbmSupported();
119113

120114
// Check extensions.

src/core/ozone/egl_helper.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
QT_BEGIN_NAMESPACE
2626

27-
class QOffscreenSurface;
28-
2927
class EGLHelper
3028
{
3129
public:
@@ -60,7 +58,6 @@ class EGLHelper
6058

6159
EGLDisplay m_eglDisplay = EGL_NO_DISPLAY;
6260
QScopedPointer<EGLFunctions> m_functions;
63-
QScopedPointer<QOffscreenSurface> m_offscreenSurface;
6461
bool m_isDmaBufSupported = false;
6562
};
6663

0 commit comments

Comments
 (0)