diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-29 15:51:46 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-29 15:55:24 (GMT) |
| commit | 8bd8a376cde068d0682142a6e25f25ed5931e2ee (patch) | |
| tree | c962cff799c0327a3025e7e0c8e45f285cccb094 | |
| parent | 77ece74c2473c0f0c6a6d8bc229d447b19594da2 (diff) | |
| download | Qt-8bd8a376cde068d0682142a6e25f25ed5931e2ee.zip Qt-8bd8a376cde068d0682142a6e25f25ed5931e2ee.tar.gz Qt-8bd8a376cde068d0682142a6e25f25ed5931e2ee.tar.bz2 | |
Don't detect EGLImage presence by testing function pointers
Might fix the Symbian build failures... who knows with Symbian.
Reviewed-By: TrustMe
| -rw-r--r-- | src/openvg/qpixmapdata_vg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp index 7550446..32fabb5 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -487,7 +487,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type) pfnVgCreateEGLImageTargetKHR vgCreateEGLImageTargetKHR = (pfnVgCreateEGLImageTargetKHR) eglGetProcAddress("vgCreateEGLImageTargetKHR"); - if (eglGetError() != EGL_SUCCESS || !eglCreateImageKHR || !eglDestroyImageKHR || !vgCreateEGLImageTargetKHR) { + if (eglGetError() != EGL_SUCCESS || !(QEgl::hasExtension("EGL_KHR_image") || QEgl::hasExtension("EGL_KHR_image_pixmap")) || !vgCreateEGLImageTargetKHR) { cleanup(); driver.Close(); return; @@ -606,7 +606,7 @@ void* QVGPixmapData::toNativeType(NativeType type) pfnVgCreateEGLImageTargetKHR vgCreateEGLImageTargetKHR = (pfnVgCreateEGLImageTargetKHR) eglGetProcAddress("vgCreateEGLImageTargetKHR"); - if (eglGetError() != EGL_SUCCESS || !eglCreateImageKHR || !eglDestroyImageKHR || !vgCreateEGLImageTargetKHR) { + if (eglGetError() != EGL_SUCCESS || !(QEgl::hasExtension("EGL_KHR_image") || QEgl::hasExtension("EGL_KHR_image_pixmap")) || !vgCreateEGLImageTargetKHR) { driver.Close(); return 0; } |