AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove explicit tracking of QOpenGLContext in QWindowsGLContext

Browse Source 
QPlatformOpenGLContext takes care of that via QPlatformOpenGLContextPrivate,
which is set up in QOpenGLContext::create().

Change-Id: I1088c2e18efe6023c8e76f126d967a607746e980
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-06-29 19:53:36 +02:00
parent 46d4c2022d
commit a94b4f1b14
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/windows/qwindowsglcontext.cpp
View File

@ -1052,7 +1052,6 @@ QOpenGLStaticContext *QOpenGLStaticContext::create(bool softwareRendering)
QWindowsGLContext::QWindowsGLContext(QOpenGLStaticContext *staticContext,
QOpenGLContext *context) :
m_staticContext(staticContext),
m_context(context),
m_renderingContext(nullptr),
m_pixelFormat(0),
m_extensionsUsed(false),

3
src/plugins/platforms/windows/qwindowsglcontext.h
View File

@ -204,7 +204,7 @@ class QWindowsGLContext : public QWindowsOpenGLContext
public:
explicit QWindowsGLContext(QOpenGLStaticContext *staticContext, QOpenGLContext *context);
~QWindowsGLContext() override;
bool isSharing() const override { return m_context->shareHandle(); }
bool isSharing() const override { return context()->shareHandle(); }
bool isValid() const override { return m_renderingContext && !m_lost; }
QSurfaceFormat format() const override { return m_obtainedFormat; }
@ -228,7 +228,6 @@ private:
bool updateObtainedParams(HDC hdc, int *obtainedSwapInterval = nullptr);
QOpenGLStaticContext *m_staticContext;
QOpenGLContext *m_context;
QSurfaceFormat m_obtainedFormat;
HGLRC m_renderingContext;
std::vector<QOpenGLContextData> m_windowContexts;