Use FBOs as pixmap backend in GL graphics system.

We now use FBOs to implement render-to-pixmap for the GL pixmap backend.
A multisample FBO is used for rendering, and is then blitted onto a
non-multisample FBO dynamically bound to the relevant texture.

Reviewed-by: Tom

1 files changed, 18 insertions, 1 deletions

diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index 97f4959eac..b1b31f7029 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -60,6 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 class QPaintEngine;
+class QGLFramebufferObject;
 
 class QGLPixmapData : public QPixmapData
 {
@@ -72,6 +73,7 @@ public:
     void resize(int width, int height);
     void fromImage(const QImage &image,
                    Qt::ImageConversionFlags flags);
+    void copy(const QPixmapData *data, const QRect &rect);
 
     bool scroll(int dx, int dy, const QRect &rect);
 
@@ -87,6 +89,17 @@ public:
 
     void ensureCreated() const;
 
+    bool isUninitialized() const { return m_dirty && m_source.isNull(); }
+
+    QSize size() const { return QSize(m_width, m_height); }
+    int width() const { return m_width; }
+    int height() const { return m_height; }
+
+    QGLFramebufferObject *fbo() const;
+
+    void beginPaint();
+    void endPaint();
+
 protected:
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
 
@@ -94,11 +107,15 @@ private:
     QGLPixmapData(const QGLPixmapData &other);
     QGLPixmapData &operator=(const QGLPixmapData &other);
 
+    static bool useFramebufferObjects();
+
     int m_width;
     int m_height;
 
+    mutable QGLFramebufferObject *m_renderFbo;
+    mutable uint m_textureId;
+    mutable QPaintEngine *m_engine;
     mutable QGLContext *m_ctx;
-    mutable GLuint m_texture;
     mutable bool m_dirty;
     mutable QImage m_source;
 };