summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-0/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Prevent crash in GL 2 engine when stroking null rectangle.Samuel Rødal2010-11-171-0/+23
| | | | | | | | | | Task-number: QTBUG-15320 Reviewed-by: Kim
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-0/+122
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Prevented race condition on texture destruction.Samuel Rødal2010-11-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | When texture destruction was triggered from a different thread, we posted a signal to the QGLSignalProxy. However, before the signal is delivered the corresponding QGLContext might be destroyed in the main thread. We need to post a signal to a QObject which is destroyed when the QGLContext is destroyed instead, to prevent trying to access an invalid QGLContext pointer. Task-number: QT-4238 Reviewed-by: Gunnar Sletta
| * Prevented threading related crash in OpenGL module.Samuel Rødal2010-10-291-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | If the last shallow copy of a QImage which is cached in the QGLTextureCache is destroyed in a thread at the same time as the QGLContext which the texture was initialized in is active in a different thread, the QImage thread incorrectly tries to make the context active in two threads at once. To prevent this from happening it's best to always do the texture clean-up in the main thread. Task-number: QT-4238 Reviewed-by: Eskil Abrahamsen Blomfeldt
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsView: fix few artefacts that can appear if the changed() signal is connected. tst_qmetaobject: fix compilation, now that wrong NOTIFY property fails Fixed autotest compilation issue on solaris Fixed build issue on Solaris Remove wrong NOTIFY attribute. Ignore LayoutDirectionChange event in QTextControl Fix an obvious bug in tst_QGL::clipTest() moc: Error if the NOTIFY signal is invalid. QDateEdit/QTimeEdit: remove duplicate properties.
| | * Fix an obvious bug in tst_QGL::clipTest()Trond Kjernåsen2010-08-191-1/+1
| | | | | | | | | | | | Reviewed-by: Samuel
| * | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-0/+1
| |/ | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* | tst_qgl: enable back on macOlivier Goffart2010-07-301-2/+0
| | | | | | | | QTBUG-12138 is closed
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-1/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Don't run the QGL test on systems that does not have GL support.Trond Kjernåsen2010-07-271-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | On a Mac that has no screens connected, it is possible to create offscreen GL contexts, but not normal QGLWidgets. There are some assumptions both in the tests and in the QGL module that this if you can create one of them, you can create both. The test now check if it can create a valid QGLWidget, if it can't it will skip running all the QGL tests. Task-number: QTBUG-12138 Reviewed-by: Prasanth
* | tst_QGL: Skip all QGL test on mac as they crash and prevent integrationOlivier Goffart2010-07-141-14/+2
| | | | | | | | See QTBUG-12138
* | Skipped tst_QGL::replaceClipping on mac.Olivier Goffart2010-07-131-0/+4
| | | | | | | | | | As it prevent integration See QTBUG-12138
* | Skipped tst_QGL::glPBufferRendering on mac.Olivier Goffart2010-07-131-0/+4
| | | | | | | | | | As it prevent integration See QTBUG-12138
* | Skipped tst_QGL::glFBOUseInGLWidget on mac.Olivier Goffart2010-07-131-0/+3
| | | | | | | | | | As it prevent integration See QTBUG-12138
* | Skipped tst_QGL::graphicsViewClipping on mac.Olivier Goffart2010-07-121-0/+3
| | | | | | | | | | As it prevent integration See QTBUG-12138
* | Fix the tests for the internal GL resource system.Trond Kjernåsen2010-07-021-17/+9
|/
* Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+1
| | | | | | Temporary fix until configure.exe can be re-compiled. Reviewed-By: TrustMe
* Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGLTom Cooksey2010-03-101-2/+2
| | | | | | | QGLWidget::renderPixmap now works under X11/EGL. Tested on both Fremantle and Harmattan. Reviewed-By: TrustMe
* Update tst_QGL::getSetCheck to check for new (correct) behaviourTom Cooksey2010-03-101-6/+7
| | | | Reviewed-By: Trond
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-4/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Fixed qgl autotest failures on Maemo.Samuel Rødal2010-02-262-4/+9
| | | | | | | | | | | | | | | | | | | | | | Changed glFBOSimpleRendering and glFBOUseInGLWidget auto tests to use NPOT sizes. NPOT FBOs are not twiddled, and thus not exposed to the twiddled glReadPixels() bug in the current drivers. Skipped glWidgetRenderPixmap as renderPixmap() is not supported under EGL currently. Reviewed-by: Tom Cooksey
| * Skip complex FBO tests if combined depth-stencil isn't supportedTom Cooksey2010-02-261-1/+16
| | | | | | | | Reviewed-By: Trond Kjernåsen
* | Fixed a warning.Trond Kjernåsen2010-02-241-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Skip complex FBO tests if combined depth-stencil isn't supportedTom Cooksey2010-02-231-1/+16
| | | | | | | | Reviewed-By: Trond Kjernåsen
* | Make tst_QGL::glWidgetRendering use same test as FBO autotestTom Cooksey2010-02-231-39/+47
| | | | | | | | | | | | | | | | | | Now glWidgetRendering & glFBORendering are drawing the same test pattern. This means that if glFBORendering is failing but glWidgetRendering is passing, it's the FBO code which is broken, not the paint engine. Reviewed-By: Trond Kjernåsen
* | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-8/+16
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * Fix several bugs with GL texture cacheTom Cooksey2010-02-121-8/+16
| | | | | | | | | | Reviewed-By: Trond Autotest: tst_QGL::qglContextDefaultBindTexture
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-093-2/+247
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-01-293-2/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes quite a lot of issues: * QtOpenGL only registered qpixmap destruction hooks on X11 and those only cleanup the EGL/GLX surface, not the texture object. * The QPixmap destruction hooks were only being called from the QPixmap destructor. However, this means when a QPixmap is assigned to another QPixmap, the hooks don't get called. Task-number: QTBUG-7647 Reviewed-By: Samuel Reviewed-By: Trond
* | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-2/+0
| | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* | Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-071-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| | * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6'Thiago Macieira2010-01-081-32/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * | Remove QGLShareRegister and transfer its functionality to QGLContextGroupRhys Weatherley2010-01-041-32/+1
| |/ | | | | | | | | Task-number: QT-2600 Reviewed-by: Samuel
* | Fixed QGLFormat::operator== to handle new fields.Kim Motoyoshi Kalland2010-01-041-0/+41
|/ | | | | | | | When I added new fields to QGLFormat in commit 592dc597, I forgot to update operator==. It has now been fixed and the auto-test updated. Reviewed-by: Trond
* Fix autotest which checks for sample buffersTom Cooksey2009-12-151-6/+1
| | | | | | | | Change c4d66e27 made sample buffers on EGL platforms to default to off, matching desktop GL. This patch fixes the autotest which was still testing for the old behaviour. Reviewed-By: TrustMe
* Add autotest for creating a QGLWidget with alpha channelTom Cooksey2009-12-151-0/+12
| | | | Task-number: QT-2602
* Make isSharing() reset to false when context no longer sharingRhys Weatherley2009-11-151-0/+5
| | | | | | | | | | The documentation for QGLContext::isSharing() indicates that the function returns true only when the context is sharing. However, previously the sharing flag would stay on if the context was created as sharing but is no longer sharing. Task-number: QTBUG-5578 Reviewed-by: Sarah Smith
* Add a simpler FBO autotest which just uses glClear()Tom Cooksey2009-11-091-0/+31
| | | | If this autotest doesn't pass, FBOs are really broken.
* Mark both the new and original EGL contexts as sharingRhys Weatherley2009-11-091-0/+1
| | | | | | | If we succeed in creating a shared context, then mark the original as shared as well. Reviewed-by: Sarah Smith
* Set frameless window hints on QGL test windows under QWSRhys Weatherley2009-11-091-0/+15
| | | | | | | | | | | | | | QWS combines the window title bar and the top-level widget into one window surface, which causes problems when the top-level widget is a QGLWidget: the raw GL surface contents are not the same as on other platforms where only the top-level widget contents are included in the window surface. This change sets Qt::FramelessWindowHint on QWS systems on widgets where we need to read back the top-level widget for comparison against a reference image. Reviewed-by: Sarah Smith
* Make qgl autotests more stable & passing in test farmTom Cooksey2009-11-061-6/+18
| | | | | | | | | There were problems with false-failures due to the test farm's GL implementation having off-by-one pixel errors. To fix this, we don't compare every pixel but rather sample pixels in a grid pattern which avoids boundries. Reviewed-By: Samuel
* Enable & fix qgl autotests on 16-bpp systemsTom Cooksey2009-11-061-49/+111
| | | | | | | | | Introduce a fuzzy pixel and image compare which changes it's allowed fuzz based on the system's color depth. If the compared images are different, the autotests will also save the two images to the current directory for comparison. Reviewed-By: Samuel
* Removed the FBO stacking behaviour and the test attached to it.Trond Kjernåsen2009-11-051-105/+0
| | | | | | | Having this behaviour in QGLFrameBufferObject complicates alot of things and isn't really necessary. Reviewed-by: Tom Cooksey
* Fix some test failures in the qgl test on 16 bit servers.Trond Kjernåsen2009-10-301-0/+22
| | | | | | | These tests are designed to run in 24 or 32 bit mode, and won't work unless they do.. Reviewed-by: Samuel