summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglframebufferobject_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-22 09:00:29 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-22 09:00:29 (GMT)
commit6d23a6d0a2954a4895dd5c1cfade28eab5a2874e (patch)
treef2f1709febef96b8eec5fcf5f450abe50759a4c7 /src/opengl/qglframebufferobject_p.h
parent746be2ba8d54e2c9803af6a6ba3cc0b6bf1da258 (diff)
parente2f90ecdde9550986df1539aa88eb5fc41d939e1 (diff)
downloadQt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.zip
Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.gz
Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/opengl/qglframebufferobject_p.h')
-rw-r--r--src/opengl/qglframebufferobject_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h
index d7f96a5..d8ff012 100644
--- a/src/opengl/qglframebufferobject_p.h
+++ b/src/opengl/qglframebufferobject_p.h
@@ -111,14 +111,16 @@ public:
virtual QSize size() const {return fbo->size();}
virtual QGLContext* context() const;
virtual QGLFormat format() const {return fboFormat;}
+ virtual bool alphaRequested() const { return reqAlpha; }
void setFBO(QGLFramebufferObject* f,
QGLFramebufferObject::Attachment attachment);
private:
- bool wasBound;
QGLFramebufferObject* fbo;
QGLFormat fboFormat;
+ bool wasBound;
+ bool reqAlpha;
};
class QGLFramebufferObjectPrivate