1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made FBO blit behave properly

Browse Source 
Change-Id: Iad9b9823bbcdf1068455f743e5fbc554939f8592
Reviewed-on: http://codereview.qt-project.org/4630
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Gunnar Sletta 2011-09-10 09:57:39 +02:00 committed by Samuel Rødal
parent b097968c60
commit 221ad14f3d
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/opengl/qopenglframebufferobject.cpp
View File

@ -1148,6 +1148,21 @@ bool QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()
return QOpenGLExtensions(QOpenGLContext::currentContext()).hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit); return QOpenGLExtensions(QOpenGLContext::currentContext()).hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit);
} }
/*!
\overload
\sa blitFramebuffer
*/
void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
QOpenGLFramebufferObject *source,
GLbitfield buffers, GLenum filter)
{
blitFramebuffer(target, QRect(QPoint(0, 0), target->size()),
source, QRect(QPoint(0, 0), source->size()),
buffers, filter);
}
/*! /*!
Blits from the \a sourceRect rectangle in the \a source framebuffer Blits from the \a sourceRect rectangle in the \a source framebuffer
object to the \a targetRect rectangle in the \a target framebuffer object. object to the \a targetRect rectangle in the \a target framebuffer object.
@ -1191,29 +1206,22 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
if (!extensions.hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit)) if (!extensions.hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit))
return; return;
QSurface *surface = ctx->surface();
const int height = static_cast<QWindow *>(surface)->height();
const int sh = source ? source->height() : height;
const int th = target ? target->height() : height;
const int sx0 = sourceRect.left(); const int sx0 = sourceRect.left();
const int sx1 = sourceRect.left() + sourceRect.width(); const int sx1 = sourceRect.left() + sourceRect.width();
const int sy0 = sh - (sourceRect.top() + sourceRect.height()); const int sy0 = sourceRect.top();
const int sy1 = sh - sourceRect.top(); const int sy1 = sourceRect.top() + sourceRect.height();
const int tx0 = targetRect.left(); const int tx0 = targetRect.left();
const int tx1 = targetRect.left() + targetRect.width(); const int tx1 = targetRect.left() + targetRect.width();
const int ty0 = th - (targetRect.top() + targetRect.height()); const int ty0 = targetRect.top();
const int ty1 = th - targetRect.top(); const int ty1 = targetRect.top() + targetRect.height();
extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, source ? source->handle() : 0); extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, source ? source->handle() : 0);
extensions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target ? target->handle() : 0); extensions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target ? target->handle() : 0);
extensions.glBlitFramebuffer(sx0, sy0, sx1, sy1, extensions.glBlitFramebuffer(sx0, sy0, sx1, sy1,
tx0, ty0, tx1, ty1, tx0, ty0, tx1, ty1,
buffers, filter); buffers, filter);
extensions.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); extensions.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo);
} }

4
src/gui/opengl/qopenglframebufferobject.h
View File

@ -112,6 +112,10 @@ public:
QOpenGLFramebufferObject *source, const QRect &sourceRect, QOpenGLFramebufferObject *source, const QRect &sourceRect,
GLbitfield buffers = GL_COLOR_BUFFER_BIT, GLbitfield buffers = GL_COLOR_BUFFER_BIT,
GLenum filter = GL_NEAREST); GLenum filter = GL_NEAREST);
static void blitFramebuffer(QOpenGLFramebufferObject *target,
QOpenGLFramebufferObject *source,
GLbitfield buffers = GL_COLOR_BUFFER_BIT,
GLenum filter = GL_NEAREST);
private: private:
Q_DISABLE_COPY(QOpenGLFramebufferObject) Q_DISABLE_COPY(QOpenGLFramebufferObject)