diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-17 22:20:46 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-17 22:20:46 (GMT) |
| commit | 3ec54c15f37c8f74fc86486abf67697eb1f5cded (patch) | |
| tree | d05913133c528b4c0bcd7c498ea193d786921d10 | |
| parent | 7813e29760120d8e7ed0b1f4c91767cc809a2623 (diff) | |
| parent | 9a712c48fb8047c3ed833db7d47382eb072711d6 (diff) | |
| download | Qt-3ec54c15f37c8f74fc86486abf67697eb1f5cded.zip Qt-3ec54c15f37c8f74fc86486abf67697eb1f5cded.tar.gz Qt-3ec54c15f37c8f74fc86486abf67697eb1f5cded.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
| -rw-r--r-- | src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c index b26938b..253f39f 100644 --- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c +++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c @@ -48,6 +48,13 @@ #define WSEGL_UNUSED(x) (void)x; +// If the PVR2D version is not specified, then assume MBX-style headers. +// If the version is defined, then we assume that we have SGX-style headers. +#if !defined(PVR2D_REV_MAJOR) +#define WSEGL_CAP_WINDOWS_USE_HW_SYNC WSEGL_CAP_WINDOWS_USE_MBX_SYNC +#define WSEGL_CAP_PIXMAPS_USE_HW_SYNC WSEGL_CAP_PIXMAPS_USE_MBX_SYNC +#endif + /* Capability information for the display */ static WSEGLCaps const wseglDisplayCaps[] = { {WSEGL_CAP_WINDOWS_USE_HW_SYNC, 1}, |