summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/kernel/qplatformglcontext_qpa.cpp12
-rw-r--r--src/gui/kernel/qplatformglcontext_qpa.h1
-rw-r--r--src/opengl/qgl_qpa.cpp1
-rw-r--r--src/opengl/qglpaintdevice.cpp6
4 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/kernel/qplatformglcontext_qpa.cpp b/src/gui/kernel/qplatformglcontext_qpa.cpp
index 516bf24..36db2b0 100644
--- a/src/gui/kernel/qplatformglcontext_qpa.cpp
+++ b/src/gui/kernel/qplatformglcontext_qpa.cpp
@@ -44,18 +44,6 @@
QPlatformGLContext::~QPlatformGLContext()
{ }
-/*!
- The frame buffer object that a QGLWidget is painted to and that gets bound
- when a QGLFramebufferObject is released.
-
- The default implementation returns 0, which denotes the default
- window-system provided frame buffer.
-*/
-unsigned long QPlatformGLContext::defaultFBO() const
-{
- return 0;
-}
-
static QPlatformGLContext *staticSharedContext = 0;
void QPlatformGLContext::setDefaultSharedContext(QPlatformGLContext *sharedContext)
diff --git a/src/gui/kernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h
index 3e7656b..ff848ed 100644
--- a/src/gui/kernel/qplatformglcontext_qpa.h
+++ b/src/gui/kernel/qplatformglcontext_qpa.h
@@ -58,7 +58,6 @@ public:
virtual void doneCurrent() = 0;
virtual void swapBuffers() = 0;
virtual void* getProcAddress(const QString& procName) = 0;
- virtual unsigned long defaultFBO() const;
virtual QPlatformWindowFormat platformWindowFormat() const = 0;
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))