summaryrefslogtreecommitdiffstats
path: root/src/opengl/opengl.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-1/+1
|\ | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-221-1/+1
| | | | | | | | | | | | | | | | Destroyed swap behaviour is a little bit faster than preserved swap with heavily animated UIs like QML. Task-number: QTBUG-18270 Reviewed-by: Samuel Rødal
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-2/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| * Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-151-2/+7
| | | | | | | | | | | | | | | | | | Keep the implementation in separate qpixmapdata_poolgl.cpp file until the pooling has been verified and confirmed to work ok. Task-number: QTBUG-15253 QTBUG-17850 Reviewed-by: Samuel Rødal
* | Fixes compilation when using FreeType on Symbian.Yoann Lopes2011-01-311-0/+7
| |
* | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
| | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Add inter-process binary shader cache for MeeGoHarald Fernengel2010-12-211-1/+3
| | | | | | | | | | | | | | | | This patch significantly reduces MeeGo app startup times by caching binary shaders in a shared memory segment. Reviewed-by: Robert Griebl Reviewed-by: Samuel Rødal
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-10/+20
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/opengl.pro src/opengl/qgl.cpp src/opengl/qgl_p.h
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-10/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| | * Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-9/+19
| | | | | | | | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-191-0/+2
|\ \ \ | |/ /
| * | QGLFunctions - cross-platform access to ES2.0 APIRhys Weatherley2010-08-121-0/+2
| |/
* | Never compile lighthouse with EGL supportJørgen Lind2010-07-071-2/+0
| | | | | | | | it should reside in the plugin, not in the opengl module nor in gui
* | Adding -qpa configure switchJørgen Lind2010-06-241-2/+2
| | | | | | | | also renaming the embedded_lite qmake switch to be qpa
* | Renamed files from *_lite* to *_qpa*Jørgen Lind2010-06-241-1/+1
| |
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/qws.conf src/corelib/io/qresource.cpp src/gui/image/qpixmapdata_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/opengl/qgl_p.h src/plugins/mediaservices/gstreamer/gstreamer.pro
| * fix irix buildOswald Buddenhagen2010-05-201-0/+1
| | | | | | | | | | Task-number: QTBUG-10611 Reviewed-by: joerg
* | Added QPlatformGLContext to QPlatformWindowJørgen Lind2010-06-111-4/+2
| | | | | | | | and removed the the creator function. Child QGLWidgets don't work
* | gl on openkode. QGLWidget only works for toplevel widgetsJørgen Lind2010-06-011-7/+3
| | | | | | | | and QGLWindowSurface is used for anything else
* | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-211-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/kernel/qapplication.cpp src/gui/painting/qbackingstore.cpp src/opengl/qgl.cpp src/opengl/qgl_p.h src/plugins/plugins.pro tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir tools/tools.pro
| * Support building with desktop OpenGL managed via EGLTom Cooksey2010-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mostly replaces lots of QT_OPENGL_ES defines with QT_NO_EGL instead. It also switches off EGL auto-detection by default. This is to make sure we default to using GLX on systems with both EGL and desktop OpenGL. If -opengl es1|es2 or -openvg is specified, then EGL auto-detection is switched back on (as a requirement. If configure auto-detects OpenGL ES it also switches on EGL auto-detection, but failue then just disables both EGL & OpenGL. As a side effect, this patch also fixes building Qt when both EGL and glx are avaliable, as they are in Mesa >= 7.8.0. Reviewed-by: Trond Task-number: QTBUG-9691
| * Fix build on WindowsTom Cooksey2010-03-261-0/+1
| | | | | | | | | | | | | | On unix platforms, QT_NO_EGL is defined by configure. However, this is not defined by windows's configure.exe so add it in opengl.pro. Reviewed-By: Brad
* | Rename qglplatformintegration_lite.h & add QGLWidget surfaceTom Cooksey2010-04-081-1/+1
| |
* | Introduce QPlatformGLContext to enable QtOpenGL in LighthouseTom Cooksey2010-04-061-0/+1
| | | | | | | | | | This patch basically takes the stubbed-out code and makes it call into the new abstract base class.
* | Stub out QtOpenGL on Lighthouse & get it compilingTom Cooksey2010-03-311-0/+12
| |
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-011-5/+7
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/gui/egl/qegl.cpp src/gui/kernel/qdnd_p.h
| * Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-5/+3
| | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
| * Add the QGLBuffer class to Qt 4.7 for VBO'sRhys Weatherley2010-02-011-0/+2
| | | | | | | | Reviewed-by: Sarah Smith
| * Merge branch '4.6'Thiago Macieira2010-01-081-2/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * | Added QTriangulator.Kim Motoyoshi Kalland2009-12-021-2/+4
| | | | | | | | | | | | Task-number: QT-2594
* | | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-2/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
| * | Move QGLTextureGlyphCache into it's own fileTom Cooksey2010-01-051-2/+4
| |/ | | | | | | Reviewed-By: Samuel
* | make sure that x11 is disabled when building embedded_liteHarald Fernengel2009-12-041-1/+1
|/
* Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-041-16/+1
| | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
* Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-041-8/+2
| | | | | | | | | Moved duplicated and broken code for setting up the include and library paths into the egl.prf feature file, which egl.pri and opengl.pro now includes using the qmake feature system. Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
* Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-021-12/+10
| | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll
* Add a new window surface which utilises QX11GLPixmapDataTom Cooksey2009-10-201-3/+4
| | | | | The new surface uses XCopyArea to post updates to the window and thus, supports partial updates.
* Add a new QX11GLPixmapData which renders to X pixmaps using GLTom Cooksey2009-10-191-2/+5
| | | | | Enable it by setting QT_USE_X11GL_PIXMAPS environment variable while using the -graphicssystem opengl
* Integrated new triangulating stroker into QtGunnar Sletta2009-10-191-2/+4
|
* Remove unnecessary QWSGLPaintDevice now that we have QGLPaintDeviceRhys Weatherley2009-10-151-3/+1
| | | | Reviewed-by: Tom
* Add a QMAKE_LFLAGS_EGL and QMAKE_LFLAGS_OPENGLTom Cooksey2009-09-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | When you link cross-compiled applications on Linux, the linker needs to be able to find not just the libraries the application links against (like libQtGui.so), but the libraries' dependencies. E.g. examples/widgets/wiggly links against QtGui. QtGui links against libEGL.so. Therefore, when you link wiggly, the linker has to be able to find libEGL.so, even though wiggly doesn't use EGL directly. To facilitate this, -Wl,rpath-link=/path/to/egl needs to be added to QMAKE_PRL_LIBS in libQtGui.prl and -Wl,rpath-link=/path/to/gl needs to be added to QMAKE_PRL_LIBS in libQtOpenGL.prl. This only needs to be done when the EGL/GL libs are not in the default search directories. As the paths will also change depending on the mkspec, two new variables have been added: QMAKE_LFLAGS_EGL & QMAKE_LFLAGS_OPENGL. These can be set in the mkspec and will be added to the relevent prls. E.g. QMAKE_LFLAGS_EGL += -Wl,-rpath-link=$${QMAKE_LIBDIR_EGL} QMAKE_LFLAGS_OPENGL += -Wl,-rpath-link=$${QMAKE_LIBDIR_OPENGL} Reviewed-by: Marius Storm-Olsen
* Make QtOpenGL link against EGL for OpenGL ESTom Cooksey2009-09-091-1/+9
| | | | | | | | | | Previously, QtOpenGL assumed that by linking against QtGui, it would automatically also be linked against EGL. However, this is no longer the case after 83940f25dba51a9942ab55ed8475fc7fc8a8da84 which makes sure only QtGui links against EGL and not other libs/apps linking against QtGui. Reviewed-by: Rhys Weatherley
* Make QGLFramebufferObject work again using new QGLPaintDevice APITom Cooksey2009-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also refactors QGL2PaintEngineEx::ensureActive() and the logic which handles multiple paint engines rendering to the same QGLContext. In a nut-shell: * QGLPaintDevice::beginPaint() stores the currently bound FBO * QGLPaintDevice::ensureActiveTarget() makes sure that GL rendering will end up in the paint device (I.e. the right context is current and the right FBO is bound). If a different context or FBO was bound, it is _not_ remembered. * QGLPaintDevice::endPaint() restores whatever FBO was bound when beginPaint() was called. This logic allows interleaved painter rendering to multiple FBOs and contexts to work as expected. It also allows a stacked begin/end to work properly when it's mixed with native GL rendering (as far as current render target is concerened. GL state clobbering is obviously a different topic). QGLPaintDevice::context() also had to be made virtual as there's no good place to call setContext. This might be possible to change in the future though. Finally, to make this work, QGLFramebufferObjectPrivate had to be moved into it's own private header.
* Replace QGLDrawable with a new QGLPaintDeviceTom Cooksey2009-09-081-1/+5
| | | | | | | | | | | | | | | | | This patch adds a new abstract base class which inherits from QPaintDevice called QGLPaintDevice. This base class will contain everything the GL paint engines need to know about the surface they are drawing onto. As such, new surfaces can be targeted by the GL paint engines without having to modify QtOpenGL. This is very useful for plugins, specifically QGraphicsSystem plugins. To unify things a little, the GL paint engines will use the same QGLPaintDevice API to render into existing target surfaces (QGLWidget, QGLPixelBuffer & QGLFrameBufferObject). Ideally we'd make QGLPaintDevice a common ancestor for these surfaces, but obviously that wil break B/C. This patch only implements QGLWidget using the new interface. Rendering to other surfaces will be fixed in following patches.
* Make QGraphicsShaderEffect private API for 4.6Rhys Weatherley2009-09-061-1/+1
| | | | | | | The custom shader code in the OpenGL2 paint engine needs time to mature before we make this official public API. Reviewed-by: trustme
* Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-171-2/+12
|\
| * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
* | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-071-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/auto.pro
| * Add qglpixelbuffer_p.h to opengl.pro so Creator finds itTom Cooksey2009-08-031-0/+1
| | | | | | | | Reviewed-By: Trustme
* | Implement QGraphicsShaderEffect for custom shader-based effectsRhys Weatherley2009-07-241-0/+2
| |
generated by cgit v0.12 at 2024-08-28 21:28:45 (GMT)