Changeset 846 for trunk/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h (modified) (7 diffs)

trunk/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -63 +63 @@
 class QGL2PaintEngineExPrivate;
 
-class QGLTextureGlyphCache : public QObject, public QTextureGlyphCache
+class QTextureGlyphCache
 {
     Q_OBJECT
@@ -73 +73 @@
     virtual void resizeTextureData(int width, int height);
     virtual void fillTexture(const Coord &c, glyph_t glyph);
-    virtual int glyphMargin() const;
+    virtual int glyphPadding() const;
+    virtual int maxTextureWidth() const;
+    virtual int maxTextureHeight() const;
 
     inline GLuint texture() const { return m_texture; }
@@ -82 +84 @@
     inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; }
 
+
+
+
+
+
+
+
+
+
 
 public Q_SLOTS:
@@ -91 +102 @@
                 // destroy the fbo and texture here, but since the context
                 // is about to be destroyed, the GL server will do the
-                // clean up for us anyway
+                // clean up for us anyway. We reset everything, so that the
+                // glyph cache object can be reused later by setting a new
+                // context on it.
                 m_fbo = 0;
                 m_texture = 0;
                 ctx = 0;
+
+
+
+
+
+
+
+
             } else {
                 // since the context holding the texture is shared, and
@@ -103 +124 @@
         }
     }
+
+
 
 private:
@@ -116 +139 @@
 
     QGLShaderProgram *m_program;
+
+
 };