whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In-class initialize QWindowsGLContext members 

Change-Id: Icd84e96706d5779656d7311755596110494eacd8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Tor Arne Vestbø 2020-06-29 19:56:39 +02:00
parent a94b4f1b14
commit 9ca731ed48
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1051,14 +1051,7 @@ QOpenGLStaticContext *QOpenGLStaticContext::create(bool softwareRendering)
QWindowsGLContext::QWindowsGLContext(QOpenGLStaticContext *staticContext,
QOpenGLContext *context) :
m_staticContext(staticContext),
m_renderingContext(nullptr),
m_pixelFormat(0),
m_extensionsUsed(false),
m_swapInterval(-1),
m_ownsContext(true),
m_getGraphicsResetStatus(nullptr),
m_lost(false)
m_staticContext(staticContext)
{
if (!m_staticContext) // Something went very wrong. Stop here, isValid() will return false.
return;

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

@ -227,17 +227,17 @@ private:
inline void releaseDCs();
bool updateObtainedParams(HDC hdc, int *obtainedSwapInterval = nullptr);
QOpenGLStaticContext *m_staticContext;
QOpenGLStaticContext *m_staticContext = nullptr;
QSurfaceFormat m_obtainedFormat;
HGLRC m_renderingContext;
HGLRC m_renderingContext = nullptr;
std::vector<QOpenGLContextData> m_windowContexts;
PIXELFORMATDESCRIPTOR m_obtainedPixelFormatDescriptor;
int m_pixelFormat;
bool m_extensionsUsed;
int m_swapInterval;
bool m_ownsContext;
GlGetGraphicsResetStatusArbType m_getGraphicsResetStatus;
bool m_lost;
int m_pixelFormat = 0;
bool m_extensionsUsed = false;
int m_swapInterval = -1;
bool m_ownsContext = true;
GlGetGraphicsResetStatusArbType m_getGraphicsResetStatus = nullptr;
bool m_lost = false;
};
#endif
QT_END_NAMESPACE