summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-08-11 09:01:53 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-08-11 09:01:53 (GMT)
commit3b048f8727a125eef2ac132d95dd3d9c2acbcab2 (patch)
tree89a242d85177ab4f7835446c899adc42dbc56095 /src/opengl
parenteaf64f3a07533a30aa29eed85f6a3cbc744722a4 (diff)
downloadQt-3b048f8727a125eef2ac132d95dd3d9c2acbcab2.zip
Qt-3b048f8727a125eef2ac132d95dd3d9c2acbcab2.tar.gz
Qt-3b048f8727a125eef2ac132d95dd3d9c2acbcab2.tar.bz2
Revert "Allow customizing the default fbo from the QPlatformGLContext."
This reverts commit a8530e5db7ae25ea0ab5df4681308374abf8b6ba. Conflicts: src/gui/kernel/qplatformglcontext_qpa.cpp src/gui/kernel/qplatformglcontext_qpa.h
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl_qpa.cpp1
-rw-r--r--src/opengl/qglpaintdevice.cpp6
2 files changed, 0 insertions, 7 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index c328819..49c0860 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -139,7 +139,6 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
}
d->platformContext = widget->platformWindow()->glContext();
Q_ASSERT(d->platformContext);
- d->default_fbo = d->platformContext->defaultFBO();
d->glFormat = qt_platformwindowformat_to_glformat(d->platformContext->platformWindowFormat());
d->valid =(bool) d->platformContext;
}
diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp
index e12fdae..e1dcbfd 100644
--- a/src/opengl/qglpaintdevice.cpp
+++ b/src/opengl/qglpaintdevice.cpp
@@ -166,12 +166,6 @@ void QGLWidgetGLPaintDevice::setWidget(QGLWidget* w)
void QGLWidgetGLPaintDevice::beginPaint()
{
- // ### This should be in setWidget(), but the context of the QGLWidget
- // hasn't been set there yet.
-#ifdef Q_WS_QPA
- m_thisFBO = context()->d_ptr->platformContext->defaultFBO();
-#endif
-
QGLPaintDevice::beginPaint();
if (!glWidget->d_func()->disable_clear_on_painter_begin && glWidget->autoFillBackground()) {
if (glWidget->testAttribute(Qt::WA_TranslucentBackground))