AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up wayland-cgl-readback.

Browse Source 
Read directly into the window buffer - looks like we
don't need to do any byte swapping. Disable the frame
sync, since this causes a deadlock with the compositor.
This commit is contained in:
Morten Sorvig 2011-06-29 12:33:05 +02:00
parent ee6f25f1fe
commit 455d58e2cd
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglcontext.cpp
View File

@ -49,6 +49,7 @@
#include <OpenGL/OpenGL.h>
#include <OpenGL/glext.h>
#include <OpenGL/glu.h>
#include <QtPlatformSupport/private/cglconvenience_p.h>
@ -87,26 +88,15 @@ void QWaylandReadbackCGLContext::swapBuffers(QPlatformSurface *surface)
CGLFlushDrawable(m_glContext);
QWaylandReadbackCGLWindow *window = static_cast<QWaylandReadbackCGLWindow *>(surface);
QSize size = window->geometry().size();
QImage img(size,QImage::Format_ARGB32);
img.fill(Qt::red);
const uchar *constBits = img.bits();
void *pixels = const_cast<uchar *>(constBits);
// glReadPixels(0,0, size.width(), size.height(), GL_RGBA,GL_UNSIGNED_BYTE, pixels);
// img = img.mirrored();
// qgl_byteSwapImage(img,GL_UNSIGNED_INT_8_8_8_8_REV);
constBits = img.bits();
const uchar *constDstBits = window->buffer();
uchar *dstBits = const_cast<uchar *>(constDstBits);
memcpy(dstBits,constBits,(img.width()*4) * img.height());
uchar *dstBits = const_cast<uchar *>(window->buffer());
glReadPixels(0,0, size.width(), size.height(), GL_BGRA,GL_UNSIGNED_BYTE, dstBits);
window->damage(QRect(QPoint(0,0),size));
window->waitForFrameSync();
// ### Should sync here but this call deadlocks with the server.
//window->waitForFrameSync();
}
void (*QWaylandReadbackCGLContext::getProcAddress(const QByteArray &procName)) ()