Changeset 769 for trunk/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp (modified) (5 diffs)

trunk/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

@@ -90 +90 @@
 
 //#define QT_GL_NO_SCISSOR_TEST
+
+
+
 
 extern QImage qt_imageForBrush(int brushStyle, bool invert);
@@ -182 +185 @@
 
         glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT);
-        ctx->d_func()->bindTexture(texImage, GL_TEXTURE_2D, GL_RGBA, true, QGLContext::InternalBindOption);
+        ctx->d_func()->bindTexture(texImage, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption);
         updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform);
     }
@@ -1232 +1235 @@
                                             : d->glyphCacheType;
 
-    if (txtype > QTransform::TxTranslate)
-        glyphType = QFontEngineGlyphCache::Raster_A8;
-
-    if (glyphType == QFontEngineGlyphCache::Raster_RGBMask
-        && state()->composition_mode != QPainter::CompositionMode_Source
-        && state()->composition_mode != QPainter::CompositionMode_SourceOver)
-    {
-        drawCached = false;
+
+    
+        if (d->device->alphaRequested() || txtype > QTransform::TxTranslate
+    
+        
+        
+    
+        
     }
 
@@ -1556 +1559 @@
 #if !defined(QT_OPENGL_ES_2)
 #if defined(Q_WS_WIN)
-    extern Q_GUI_EXPORT bool qt_cleartype_enabled;
     if (qt_cleartype_enabled)
 #endif
@@ -1596 +1598 @@
     delete d->shaderManager;
     d->shaderManager = 0;
+
 
 #ifdef QT_OPENGL_CACHE_AS_VBOS