1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QOpenGLTextureHelper (Windows): Don't load desktop DLL when GLES2 is used

Browse Source 
GL functions should come from the context, not the desktop GL lib, when
Qt is configured for OpenGL ES 2 (e.g. ANGLE).

Change-Id: I794e1d5989ac72d2e98070d20e91f9c2c4cb7183
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
This commit is contained in:
Andrew Knight 2013-11-21 19:38:28 +02:00 committed by The Qt Project
parent 55a4db4f47
commit 36e9e08dcc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/opengl/qopengltexturehelper.cpp
View File

@ -148,7 +148,7 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
} }
#endif #endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN) && !defined(QT_OPENGL_ES_2)
HMODULE handle = GetModuleHandleA("opengl32.dll"); HMODULE handle = GetModuleHandleA("opengl32.dll");
// OpenGL 1.0 // OpenGL 1.0