diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-23 15:07:06 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 09:13:01 +0200 |
commit | e7f1106edb1ac37d92d7851c44cd8d99f68eaaf4 (patch) | |
tree | b4d01b3ca52a0ff8a8ec0aa1803beeac78196508 /src/opengl | |
parent | b63e101a90b677dcb192214aef35a107620c5f3c (diff) |
Windows: Add ANGLE support.
- Add QWindowsEGLContext usable for ANGLE and Windows CE.
- Add QWindowsEGLStaticContext containing the display
for resource cleanup.
- Add EGLSurface to QWindowsWindow.
- Add a -angle option specifying the path to the external
ANGLE installation to configure, add libraries to
the mkspecs.
Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com>
Task-number: QTBUG-24207
Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qglshaderprogram.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index e73e63f6a3..1d87f57c44 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -237,7 +237,8 @@ bool QGLShaderPrivate::create() else shader = glCreateShader(GL_FRAGMENT_SHADER); if (!shader) { - qWarning() << "QGLShader: could not create shader"; + qWarning("%s: Could not create shader of type %d.", + Q_FUNC_INFO, int(shaderType)); return false; } shaderGuard = createSharedResourceGuard(context, shader, freeShaderFunc); |