FCL/sf/mw/qt: comparison src/opengl/qgl.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 #include <qmutex.h>
 QT_BEGIN_NAMESPACE
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
 QGLExtensionFuncs QGLContextPrivate::qt_extensionFuncs;
 #endif
 #ifdef Q_WS_X11
 extern const QX11Info *qt_x11Info(const QPaintDevice *pd);
 default_fbo = 0;
 active_engine = 0;
 workaround_needsFullClearOnEveryFrame = false;
 workaround_brokenFBOReadBack = false;
 workaroundsCached = false;
+workaround_brokenTextureFromPixmap = false;
+workaround_brokenTextureFromPixmap_init = false;
 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
 vertexAttributeArraysEnabledState[i] = false;
 }
 QGLContext* QGLContext::currentCtx = 0;
 \value DefaultBindOption In Qt 4.5 and earlier, bindTexture()
 would mirror the image and automatically generate mipmaps. This
 option helps preserve this default behavior.
 \omitvalue CanFlipNativePixmapBindOption Used by x11 from pixmap to choose
-wether or not it can bind the pixmap upside down or not.
+whether or not it can bind the pixmap upside down or not.
 \omitvalue MemoryManagedBindOption Used by paint engines to
 indicate that the pixmap should be memory managed along side with
 the pixmap/image that it stems from, e.g. installing destruction
 hooks in them.
 #undef ctx
 #ifdef QT_NO_EGL
 void QGLContextPrivate::swapRegion(const QRegion *)
 {
-static bool firstWarning = true;
+Q_Q(QGLContext);
-if (firstWarning) {
+q->swapBuffers();
-qWarning() << "::swapRegion called but not supported!";
-firstWarning = false;
-}
 }
 #endif
 /*!
 \overload
 }
 }
 }
 }
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
 QGLExtensionFuncs& QGLContextPrivate::extensionFuncs(const QGLContext *)
 {
 return qt_extensionFuncs;
 }
 #endif
 /*! \internal */
 QGLTexture *QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format,
 QGLContext::BindOptions options)
 {
+Q_Q(QGLContext);
 const qint64 key = image.cacheKey();
 QGLTexture *texture = textureCacheLookup(key, target);
 if (texture) {
-glBindTexture(target, texture->id);
+if (image.paintingActive()) {
-return texture;
+// A QPainter is active on the image - take the safe route and replace the texture.
+q->deleteTexture(texture->id);
+texture = 0;
+} else {
+glBindTexture(target, texture->id);
+return texture;
+}
 }
 if (!texture)
 texture = bindTexture(image, target, format, key, options);
 // NOTE: bindTexture(const QImage&, GLenum, GLint, const qint64, bool) should never return null
 return data->texture();
 }
 }
 #else
 Q_UNUSED(pd);
-Q_UNUSED(q);
 #endif
 const qint64 key = pixmap.cacheKey();
 QGLTexture *texture = textureCacheLookup(key, target);
 if (texture) {
-glBindTexture(target, texture->id);
+if (pixmap.paintingActive()) {
-return texture;
+// A QPainter is active on the pixmap - take the safe route and replace the texture.
+q->deleteTexture(texture->id);
+texture = 0;
+} else {
+glBindTexture(target, texture->id);
+return texture;
+}
 }
 #if defined(Q_WS_X11)
 // Try to use texture_from_pixmap
 const QX11Info *xinfo = qt_x11Info(paintDevice);
 if (pd->classId() == QPixmapData::X11Class && pd->pixelType() == QPixmapData::PixmapType
 && xinfo && xinfo->screen() == pixmap.x11Info().screen()
 && target == GL_TEXTURE_2D)
 {
-texture = bindTextureFromNativePixmap(const_cast<QPixmap*>(&pixmap), key, options);
+if (!workaround_brokenTextureFromPixmap_init) {
-if (texture) {
+workaround_brokenTextureFromPixmap_init = true;
-texture->options |= QGLContext::MemoryManagedBindOption;
-texture->boundPixmap = pd;
+const QByteArray versionString(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
-boundPixmaps.insert(pd, QPixmap(pixmap));
+const int pos = versionString.indexOf("NVIDIA ");
+if (pos >= 0) {
+const QByteArray nvidiaVersionString = versionString.mid(pos + strlen("NVIDIA "));
+if (nvidiaVersionString.startsWith("195") || nvidiaVersionString.startsWith("256"))
+workaround_brokenTextureFromPixmap = true;
+}
+}
+if (!workaround_brokenTextureFromPixmap) {
+texture = bindTextureFromNativePixmap(const_cast<QPixmap*>(&pixmap), key, options);
+if (texture) {
+texture->options |= QGLContext::MemoryManagedBindOption;
+texture->boundPixmap = pd;
+boundPixmaps.insert(pd, QPixmap(pixmap));
+}
 }
 }
 #endif
 if (!texture) {
 #  if defined(QT_MAC_USE_COCOA)
 } else if (e->type() == QEvent::MacGLClearDrawable) {
 d->glcx->d_ptr->clearDrawable();
 #  endif
 }
+#elif defined(Q_OS_SYMBIAN)
+// prevents errors on some systems, where we get a flush to a
+// hidden widget
+if (e->type() == QEvent::Hide) {
+makeCurrent();
+glFinish();
+doneCurrent();
+} else if (e->type() == QEvent::ParentChange) {
+// if we've reparented a window that has the current context
+// bound, we need to rebind that context to the new window id
+if (d->glcx == QGLContext::currentContext())
+makeCurrent();
+if (testAttribute(Qt::WA_TranslucentBackground))
+setContext(new QGLContext(d->glcx->requestedFormat(), this));
+}
+// A re-parent is likely to destroy the Symbian window and re-create it. It is important
+// that we free the EGL surface _before_ the winID changes - otherwise we can leak.
+if (e->type() == QEvent::ParentAboutToChange)
+d->glcx->d_func()->destroyEglSurfaceForDevice();
+if ((e->type() == QEvent::ParentChange) || (e->type() == QEvent::WindowStateChange)) {
+// The window may have been re-created during re-parent or state change - if so, the EGL
+// surface will need to be re-created.
+d->recreateEglSurface();
+}
 #endif
 return QWidget::event(e);
 }
 #endif
 void QGLWidget::glDraw()
 {
 Q_D(QGLWidget);
 if (!isValid())
 return;
+#ifdef Q_OS_SYMBIAN
+// Crashes on Symbian if trying to render to invisible surfaces
+if (!isVisible() && d->glcx->device()->devType() == QInternal::Widget)
+return;
+#endif
 makeCurrent();
 #ifndef QT_OPENGL_ES
 if (d->glcx->deviceIsPixmap())
 glDrawBuffer(GL_FRONT);
 #endif
 glExtensions |= PVRTCTextureCompression;
 if (extensions.match("GL_ARB_fragment_program"))
 glExtensions |= FragmentProgram;
 if (extensions.match("GL_ARB_fragment_shader"))
 glExtensions |= FragmentShader;
+if (extensions.match("GL_ARB_ES2_compatibility"))
+glExtensions |= ES2Compatibility;
 if (extensions.match("GL_ARB_texture_mirrored_repeat"))
 glExtensions |= MirroredRepeat;
 if (extensions.match("GL_EXT_framebuffer_object"))
 glExtensions |= FramebufferObject;
 if (extensions.match("GL_EXT_stencil_two_side"))
 glExtensions |= BGRATextureFormat;
 #if defined(QT_OPENGL_ES_2)
 glExtensions |= FramebufferObject;
 glExtensions |= GenerateMipmap;
 glExtensions |= FragmentShader;
+glExtensions |= ES2Compatibility;
 #endif
 #if defined(QT_OPENGL_ES_1)
 if (extensions.match("GL_OES_framebuffer_object"))
 glExtensions |= FramebufferObject;
 #endif

changeset 37	758a864f9613
parent 33	3e2da88830cd