diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-04 14:24:03 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-04 14:24:03 +0100 |
| commit | 14430b465d39a602d917f2a701218ed56360dc4e (patch) | |
| tree | a05f4aadf195a3f78843fe9709e237ed06d98994 /src/core | |
| parent | 10cd4401b9e4e9fde2a8e17c70a0d11d2dfc306f (diff) | |
| parent | 215fe3b16d35f3a597658fd378d35bdb56116267 (diff) | |
Merge branch '5.5' into 5.6
Change-Id: Ibc8ec5ab77ef27bede6e4af1e6318378ac6b9899
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/gl_context_qt.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp index b350c3c5b..3c3b8225d 100644 --- a/src/core/gl_context_qt.cpp +++ b/src/core/gl_context_qt.cpp @@ -146,10 +146,14 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(GLShareGroup* share_group, G { #if defined(OS_WIN) scoped_refptr<GLContext> context; - if (GetGLImplementation() == kGLImplementationDesktopGL) + if (GetGLImplementation() == kGLImplementationDesktopGL) { context = new GLContextWGL(share_group); - else + if (!context->Initialize(compatible_surface, gpu_preference)) + return nullptr; + return context; + } else { context = new GLContextEGL(share_group); + } #else scoped_refptr<GLContext> context = new GLContextEGL(share_group); #endif |