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

Remove incorrect assertion from the backingstore

Browse Source 
The ifdef gave an impression of the code path being hit only when
texture-backed widgets are present and OpenGL-based compositing is
active. This is false. Asserting on having a context current is
wrong (as shown by autotests on the 5.6 branch).

Change-Id: I2539f0aac75b26597f49f63edcd9580428be79b7
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
This commit is contained in:
Laszlo Agocs 2015-11-24 21:08:56 +01:00 committed by Liang Qi
parent e4d1bf9829
commit c83eefff97
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/painting/qplatformbackingstore.cpp
View File

@ -66,11 +66,14 @@ public:
{ {
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
QOpenGLContext *ctx = QOpenGLContext::currentContext(); QOpenGLContext *ctx = QOpenGLContext::currentContext();
Q_ASSERT(ctx); if (ctx) {
if (textureId) if (textureId)
ctx->functions()->glDeleteTextures(1, &textureId); ctx->functions()->glDeleteTextures(1, &textureId);
if (blitter) if (blitter)
blitter->destroy(); blitter->destroy();
} else if (textureId || blitter) {
qWarning("No context current during QPlatformBackingStore destruction, OpenGL resources not released");
}
delete blitter; delete blitter;
#endif #endif
} }