| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Temporary fix until configure.exe can be re-compiled.
Reviewed-By: TrustMe
|
|
|
|
|
|
|
| |
QGLWidget::renderPixmap now works under X11/EGL. Tested on both
Fremantle and Harmattan.
Reviewed-By: TrustMe
|
|
|
|
| |
Reviewed-By: Trond
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-By: Trond Kjernåsen
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-By: Trond Kjernåsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/helpviewer.cpp
|
| |
| |
| |
| |
| | |
Reviewed-By: Trond
Autotest: tst_QGL::qglContextDefaultBindTexture
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| |/
| |
| |
| |
| | |
Task-number: QT-2600
Reviewed-by: Samuel
|
|/
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Task-number: QT-2602
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
If this autotest doesn't pass, FBOs are really broken.
|
|
|
|
|
|
|
| |
If we succeed in creating a shared context, then mark the original
as shared as well.
Reviewed-by: Sarah Smith
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Having this behaviour in QGLFrameBufferObject complicates alot of things
and isn't really necessary.
Reviewed-by: Tom Cooksey
|
|
|
|
|
|
|
| |
These tests are designed to run in 24 or 32 bit mode, and won't work
unless they do..
Reviewed-by: Samuel
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: Samuel
|
|
|
|
| |
Reviewed-by: Sarah Smith
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Sometimes it isn't possible to arrange for the QGLFramebufferObject
to be destroyed before the QGLContext group in which it was created.
Especially during application shutdown or in applications with
multiple shared contexts.
This change modifies QGLFramebufferObject to use QGLSharedResourceGuard,
which ensures that when the last QGLContext in a sharing group is
destroyed, any remaining FBO's will revert to !isValid(). It is now
safe to destroy the context before the FBO, or the FBO before the context.
Unit test included.
Reviewed-by: Sarah Smith
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There's no reason to stop using a scissor clip when a more complex clip
is set. Instead, we can use a combination of scissoring and depth
clipping to represent the final clip. When intersecting with a new clip
path, if the clip path is a rectangle we simply intersect it against the
scissor clip, and otherwise we intersect its bounding rect against the
scissor clip and write the actual path to the depth buffer.
The patch simplifies the logic in clip() quite a bit, except in the
UniteClip case in which we don't care about performance anyways.
It also fixes a bug which could cause rendering errors if the stencil
buffer contains junk before painting.
Reviewed-by: Gunnar Sletta
|
|
|
|
|
|
|
| |
Interleaved rendering to GL targets is going to be flaky with the GL1
engine and wont be supported.
Reviewed-by: Trustme
|
|
|
|
| |
Reviewed-by: Trustme
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Sarah Smith
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
|
| |
The documentation says "Returns true if all the options of the
two QGLFormats are equal", but that's not what it was doing.
Reviewed-by: Sarah Smith
|
|
|
|
|
|
|
|
| |
Commit 66961012e6eb494541bdc166e21f7af55eef73a5 changed the
QGLFramebufferObjectFormat API, so the test needed to be updated as
well.
Reviewed-by: Kim
|
|
|
|
| |
Reviewed-By: Samuel
|
|
|
|
|
|
|
|
| |
The test mimics examples/opengl/framebufferobjects in that it begins a
QPainter on a QGLWidget in it's paint event, then begins a second
QPainter on a QGLFramebufferObject, leaving 2 painters active at the same
time. When the FBO's painter is ended, GL rendering should be
re-targetted at the QGLWidget automatically.
|