summaryrefslogtreecommitdiffstats
path: root/src/plugins/graphicssystems
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-084-0/+34
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-074-0/+34
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster
| | * Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-074-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMeeGoLivePixmap fails to lock the EGL surface and texture after switch to raster graphics system. The EGL surface is invalid after eglTerminate call in switch. But QMeeGoLivePixmapData doesn't know about the switch. Marking EGL surfaces and texture invalid after switch makes live pixmap automatically recreate the surface when next time requiring live pixmap. Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Merge-request: 2571 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-041-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added image conversion flag to prevent conversions.
| | * Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is needed in the meego graphics system to support the shared image fallback path (when using the raster graphicssystem). The flag is internal. Reviewed-by: Gunnar Sletta
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-032-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-012-96/+59
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-012-0/+8
| | | | | | | | | | | | | | | Task-number: QTBUG-17849 Reviewed-by: Samuel Rødal
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-95/+52
|\ \ \ | | |/ | |/|
| * | RGBA32 -> RGB565 dithering in Meego Graphicssystem,Tero Tiittanen2011-02-171-95/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dithering in QMeeGoPixmapData::imageToEGLSharedImage is now done using Ordered Dithering, not anymore Floyd-Steinberg dithering. This provides better overall results. Fixes: NB#208927 - X dithering looks better than meego graphicssystem one Merge-request: 1079 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-031-1/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
| * | Prevent recursion when creating window surface.Samuel Rødal2011-02-021-1/+7
| |/ | | | | | | | | | | | | | | | | If we can't access the qt_gl_share_widget() we should just create a raster window surface. This might happen when creating the share widget itself leads to creation of a window surface (which isn't really going to be used anyways). Reviewed-by: Michael Dominic K
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1725-25/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-1025-25/+25
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFont/Windows: restrict the pixel size accuracy Update copyright year to 2011. For non-developer builds, skip test that requires private API tst_qhttpnetworkconnection: Compile fix Change QHostInfoCache to use QElapsedTime instead of QTime. Fix for qtdemo bug
| | * Update copyright year to 2011.Jason McDonald2011-01-1025-25/+25
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-101-0/+2
| |/ | | | | | | | | | | | | | | | | | | Currently Symbian doesn't support semi-transparent EGL surfaces. WA_TranslucentBackground attribute is ineffective if set after EGL surface creation. To enable translucency in this case we need to recreate backing store to get raster surface which supports translucency. Task-number: QT-4416 Reviewed-by: Jason Barron
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-051-6/+2
|\ \ | |/
| * Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | | | | | | | | | | | | | Not pixmap creation. Merge-request: 988 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-132-5/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * Use a different dither distribution matrix + a bit of rand.Michael Dominic K2010-12-081-4/+7
| | | | | | | | | | | | | | | | Also don't dither on edges. Improves dithering over tiles/scaled smooth gradients. Merge-request: 971 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface ↵Michael Dominic K2010-12-081-1/+8
| | | | | | | | | | | | | | already created. Merge-request: 967 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-128-52/+191
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Coding style: bang cleanup.Michael Dominic K2010-11-111-10/+10
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Removed call to glFinish, obsoleted by fence syncs.Michael Dominic K2010-11-111-1/+0
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Plugin-side support for creating/destroying/waiting on fence sync.Michael Dominic K2010-11-114-13/+49
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Added MeeGo graphicssystem entry points for KHR_fence_sync.Michael Dominic K2010-11-112-2/+76
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Trailing whitespace fixes.Michael Dominic K2010-11-113-15/+15
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| |
| * Doc: Fixing typoSergio Ahumada2010-11-091-2/+2
| |
| * Doc: Fixing typoSergio Ahumada2010-11-031-3/+3
| |
| * Use 32bit textures for alpha textures after all.Michael Dominic K2010-11-022-2/+21
| | | | | | | | | | | | | | 4444 16bit are too bad quality-wise. Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * One more fix for dithering.Michael Dominic K2010-11-021-8/+8
| | | | | | | | | | Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * 32bit => 16bit conversion has 4byte-aligned output.Michael Dominic K2010-10-291-4/+15
| | | | | | | | | | Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-292-4/+13
|\ \ | |/
| * Do not support QImage::Format_ARGB32 in meego gfx for egl images.Michael Dominic K2010-10-281-2/+1
| | | | | | | | | | | | | | It was a bug/mistake to support that. Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Use QVarLengthArray to store accumulator data.Michael Dominic K2010-10-281-2/+12
| | | | | | | | | | Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2610-239/+817
|\ \ | |/ | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * Doc: Fixing typoSergio Ahumada2010-10-251-3/+3
| |
| * For meego graphics system, use floyd-steinberg dithering when converting to ↵Michael Dominic K2010-10-223-24/+278
| | | | | | | | | | | | | | 16bit. Merge-request: 2496 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Adding ::scroll capabilities to live pixmaps.Michael Dominic K2010-10-212-3/+70
| | | | | | | | | | Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-217-232/+334
| | | | | | | | | | | | | | Moving code from qmeegopixmapdata there. Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * In meego, support Format_RGB32 too for eglShared images.Michael Dominic K2010-10-211-2/+3
| | | | | | | | | | Merge-request: 2493 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1
| | | | | | | | | | Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Removing glFinish calls in eglSharedImage code. Not needed anymore.Michael Dominic K2010-10-181-10/+0
| | | | | | | | | | | | | | (was a driver bug after all). Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * ::copy on the QMeeGoPixmapData creates a raster-backed pixmap.Michael Dominic K2010-10-185-2/+124
| | | | | | | | | | | | | | Was required to implement a new subclass to make this happen. Merge-request: 863 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-132-5/+13
| | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v0.12 at 2025-02-08 09:11:45 (GMT)