summaryrefslogtreecommitdiffstats
path: root/src/opengl/qpixmapdata_x11gl_egl.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATICTom Cooksey2010-03-101-3/+13
| | | | | | Still not ideal, but this should do for now. Reviewed-By: TrustMe
* Handle EGLSurfaces better, including more error detectionTom Cooksey2010-03-101-2/+8
| | | | | | | Note: This changes QX11PixmapData::gl_surface to a void* to enable build on 64-bit systems where EGLSurface is a pointer. Reviewed-By: TrustMe
* Make sure pixmap hooks get installed so EGL surfaces are cleaned upTom Cooksey2010-03-101-0/+4
| | | | Reviewed-By: TrustMe
* Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl APITom Cooksey2010-03-051-82/+56
| | | | | | | It's still just as buggy, but at least it allows us to remove a lot of crud from qgl_x11egl.cpp. Reviewed-By: TrustMe
* Move static methods from QEglContext to QEgl namespaceTom Cooksey2010-03-021-11/+9
| | | | Reviewed-By: Aleksandar Sasha Babic
* Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.hTom Cooksey2010-03-021-0/+1
| | | | | | | | This puts the QEgl namespace in a single file which can be used by both qeglcontext and qeglproperties. Files which need QEglContext should now include qeglcontext_p.h. Reviewed-By: Aleksandar Sasha Babic
* Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-8/+7
|\ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * Cleanup QEglContext & EGLDisplaysTom Cooksey2010-02-121-8/+7
| | | | | | | | | | | | | | | | | | This basicaly replaces display(), openDisplay() & defaultDisplay() methods with a single display() and nativeDisplay(), the latter being implemented in the platform-specific files and everything else being cross-platform code. Reviewed-By: Trond
* | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-4/+4
|/ | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | | | | Task-number: QTBUG-7399 Reviewed-By: TrustMe
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Use different GL contexts for ARGB & RGB pixmapsTom Cooksey2009-10-191-31/+100
| | | | | | | | | On 16 bpp systems, RGB pixmaps are 16-bit whereas ARGB pixmaps are 32-bit. This means two different EGL configs are used which are incompatable with each other. As a result, we have to use 2 different EGL contexts - one for each config. Reviewed-By: Trustme
* Add a new QX11GLPixmapData which renders to X pixmaps using GLTom Cooksey2009-10-191-0/+183
Enable it by setting QT_USE_X11GL_PIXMAPS environment variable while using the -graphicssystem opengl