1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lance opengl painting test

Browse Source 
Change b94493e revealed that in the lance script rendering, at the
surface_end command, cleaning up the fbo stuff and enabling the
ordinary painting again was done in the wrong order.

Change-Id: I358dafeffe95b25303fc2a8dc1d61384b2ca64fb
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
This commit is contained in:
aavit 2014-04-03 12:54:47 +02:00 committed by The Qt Project
parent 9ce697f2d5
commit 758b9adccf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/other/lancelot/paintcommands.cpp
View File

@ -2430,11 +2430,6 @@ void PaintCommands::command_surface_end(QRegExp)
if (m_type == OpenGLType || m_type == OpenGLBufferType) { if (m_type == OpenGLType || m_type == OpenGLBufferType) {
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
QImage new_image = m_surface_glbuffer->toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); QImage new_image = m_surface_glbuffer->toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
m_default_glcontext->makeCurrent(m_default_glcontext->surface());
m_painter->drawImage(m_surface_rect, new_image);
// Flush the pipeline:
m_painter->beginNativePainting();
m_painter->endNativePainting();
delete m_surface_glpaintdevice; delete m_surface_glpaintdevice;
m_surface_glpaintdevice = 0; m_surface_glpaintdevice = 0;
@ -2442,6 +2437,12 @@ void PaintCommands::command_surface_end(QRegExp)
m_surface_glbuffer = 0; m_surface_glbuffer = 0;
delete m_surface_glcontext; delete m_surface_glcontext;
m_surface_glcontext = 0; m_surface_glcontext = 0;
m_default_glcontext->makeCurrent(m_default_glcontext->surface());
m_painter->drawImage(m_surface_rect, new_image);
// Flush the pipeline:
m_painter->beginNativePainting();
m_painter->endNativePainting();
#endif #endif
#ifdef Q_WS_X11 #ifdef Q_WS_X11
} else if (m_type == WidgetType) { } else if (m_type == WidgetType) {