summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-116-58/+55
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
| * Only cleanup share widget if it has been created.Armin Berres2011-05-101-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Without this change a not yet created share widget is created once qt_destroy_gl_share_widget() is called. As creating the widget also triggers a call to qt_cleanup_gl_share_widget() once QApplication is destroyed a QApplication created afterwards cannot use a share widget anymore. This functionality is needed for Harmattan. Merge-request: 2609 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> (cherry picked from commit 8680d831fb7066feae07690a4a6bc8e908a84e5a)
| * Fix trailing whitespacesJani Hautakangas2011-05-101-1/+1
| | | | | | | | | | Reviewed-by: TRUSTME (cherry picked from commit d4fd21f746b536eaddbdd7a07f1d717ef18278e7)
| * Fix for native child widget performance issue.Jani Hautakangas2011-05-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Flushing native child widgets in VG and GL window surfaces caused performance downgrade because unnecessary swapBuffers calls. On Symbian we must not support flushing native child widgets in VG and GL window surfaces because it causes GPU memory overhead and performance issues. Symbian graphics architecture allows us to render native child widgets to TLW EGL surface correctly in most of the cases. Task-number: QTMOBILITY-1570 Reviewed-by: Samuel Rødal (cherry picked from commit 6a92de7c89764848f7a85b1aa412a07bedc72b1a)
| * Added support for six-parameter radial gradients.Samuel Rødal2011-05-105-55/+35
| | | | | | | | | | | | | | | | | | The extended radial gradients conform to the radial gradient specification in HTML 5 canvas. Task-number: QTBUG-14075 Reviewed-by: Andreas Kling (cherry picked from commit da55c1ea92474e989e5582b02815936bbf584405)
* | Wayland plugin compile fixes.Samuel Rødal2011-05-091-1/+1
| |
* | fix remaining includesLars Knoll2011-05-074-7/+7
| | | | | | | | | | Made easy thanks to the fixqt4includes script
* | some build fixesLars Knoll2011-05-073-4/+4
| |
* | Fix compilation of QtOpenGL.Samuel Rødal2011-05-042-4/+4
| |
* | Merge remote branch 'origin/master' into refactorLars Knoll2011-05-0411-114/+224
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-041-1/+5
| |\
| | * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
| | * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-021-0/+4
| | | | | | | | | | | | Output warning if not present
| * | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-034-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the SRGB framebuffer extension in GL is available, we can support gamma correction of text with a gamma of 2.1. On Mac this is sufficient for gamma correcting subpixel antialiased text. Gray antialiasing should not be gamma corrected on Mac. On Windows, the user can potentially set the gamma value to anything between 1.0 and 2.2 (or something like that). We support anything that resembles 1.0 closely enough by pushing the text out without any correction (like before). We also support anything that resembles 2.1 (the gamma hardcoded in GL's SRGB extension) by turning on the extension before blending the text. In between the two, we'll use gray antialiasing to avoid differing too much from the raster engine (which is our reference in this.) For gray antialiasing on Windows, we use a constant gamma of 2.3 which has been determined by experimentation. Since this is close enough to 2.1 we do gamma correction with SRGB extension. The distance limit of 0.2 is determined by some experimentation. Reviewed-by: Samuel (cherry picked from commit 79ba7cceca5e4029876ace2121edd25b08ae14ce)
| * | Initial import from qtquick2.Qt by Nokia2011-04-278-110/+173
| |/ | | | | | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* | remove the graphicssystem code paths.Lars Knoll2011-05-035-274/+0
| | | | | | | | | | QPA's platform integration layer replaces the graphics system now.
* | QWS removal, part 2Lars Knoll2011-05-026-930/+1
| |
* | Add QWidgetWindow to bridge events from QWindow to QWidget.Samuel Rødal2011-04-294-51/+53
| | | | | | | | | | Gets rid of QWidget dependencies in QWindow and QWindowSurface. Events are not delivered to the correct child widget yet.
* | Added QWindowContext and got wiggly up and running with xcb.Samuel Rødal2011-04-284-86/+72
|/ | | | (cherry picked from commit c980e4ef4ebc7699a6c3a7529d3f08ebafc21ffe)
* Initial import from the monolithic Qt.Qt by Nokia2011-04-27114-0/+63044
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12