diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-04-28 12:31:00 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-04-28 12:31:00 (GMT) |
| commit | c3dfc6760d3db3f524292d99685b95d1e1238422 (patch) | |
| tree | fe48ca16e08bef4194fdf9711c220471f9a0b2f5 | |
| parent | 73610e1308d6414eda8e2a525584c83434b9cf78 (diff) | |
| download | Qt-c3dfc6760d3db3f524292d99685b95d1e1238422.zip Qt-c3dfc6760d3db3f524292d99685b95d1e1238422.tar.gz Qt-c3dfc6760d3db3f524292d99685b95d1e1238422.tar.bz2 | |
Correction to EGL stub implementation
Symbian typedefs EGLImageKHR as int rather than the reference void *
For ARM builds this causes a symbol mismatch for eglDestroyImageKHR()
when using the stubs.
Task-number: QTBUG-7870
Reviewed-by: Miikka Heikkinen
| -rw-r--r-- | src/gui/egl/qegl_p.h | 6 | ||||
| -rw-r--r-- | src/gui/egl/qegl_stub.cpp | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index 6c562ef..4fc1338 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -154,7 +154,13 @@ QT_BEGIN_NAMESPACE // Declare/define the bits of EGL_KHR_image_base we need: #if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_base) +#ifdef Q_OS_SYMBIAN +//symbian version of eglext.h differs from the khronos reference +typedef int EGLImageKHR; +#else typedef void *EGLImageKHR; +#endif + #define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) #define EGL_IMAGE_PRESERVED_KHR 0x30D2 #define EGL_KHR_image_base diff --git a/src/gui/egl/qegl_stub.cpp b/src/gui/egl/qegl_stub.cpp index 0bd3451..86a7aab 100644 --- a/src/gui/egl/qegl_stub.cpp +++ b/src/gui/egl/qegl_stub.cpp @@ -183,14 +183,6 @@ int QEglContext::configAttrib(int name) const return 0; } -typedef EGLImageKHR (EGLAPIENTRY *_eglCreateImageKHR)(EGLDisplay, EGLContext, EGLenum, EGLClientBuffer, const EGLint*); -typedef EGLBoolean (EGLAPIENTRY *_eglDestroyImageKHR)(EGLDisplay, EGLImageKHR); - -// Defined in qegl.cpp: -static _eglCreateImageKHR qt_eglCreateImageKHR = 0; -static _eglDestroyImageKHR qt_eglDestroyImageKHR = 0; - - EGLDisplay QEgl::display() { NOEGL |