summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-03-29 10:21:40 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-03-29 10:21:40 (GMT)
commit62b082833d904688e44e1bac4849bfa54bf5fe82 (patch)
tree6f4e09b6013a0898ab1e31f142c9741f5f7e9dce
parent0056c0a654a930fe082787ec7e8579a6e74d9ad5 (diff)
downloadQt-62b082833d904688e44e1bac4849bfa54bf5fe82.zip
Qt-62b082833d904688e44e1bac4849bfa54bf5fe82.tar.gz
Qt-62b082833d904688e44e1bac4849bfa54bf5fe82.tar.bz2
Don't try to resolve EGLImage function pointers if they are defined
We assume the presence of EGL_KHR_image or EGL_KHR_image_base means that the eglCreateImageKHR/eglDestroyImageKHR methods are exported by the EGL library and thus do not need to be resolved. Reviewed-By: TrustMe
-rw-r--r--src/gui/egl/qegl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index 9a552cf..f36904d 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -556,10 +556,12 @@ EGLDisplay QEgl::display()
}
// Resolve the egl extension function pointers:
+#if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_base)
if (QEgl::hasExtension("EGL_KHR_image") || QEgl::hasExtension("EGL_KHR_image_base")) {
eglCreateImageKHR = (_eglCreateImageKHR) eglGetProcAddress("eglCreateImageKHR");
eglDestroyImageKHR = (_eglDestroyImageKHR) eglGetProcAddress("eglDestroyImageKHR");
}
+#endif
}
return dpy;