yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[effects] Support blitScreenshot on OpenGLES

Browse source 
As OpenGL ES 3.0 supports framebuffer blit, we don't have to ifdef it
any more.
This commit is contained in:
Martin Gräßlin 2015-06-24 09:40:53 +02:00
parent 59a6c9ddf9
commit 1f6c0c07f7
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
effects/screenshot/screenshot.cpp
View file

@ -224,11 +224,6 @@ QString ScreenShotEffect::screenshotArea(int x, int y, int width, int height)
QString ScreenShotEffect::blitScreenshot(const QRect &geometry)
{
#ifdef KWIN_HAVE_OPENGLES
Q_UNUSED(geometry)
qCDebug(KWINEFFECTS) << "Framebuffer Blit not supported";
return QString();
#else
QImage img;
if (effects->isOpenGLCompositing())
{
@ -242,7 +237,11 @@ QString ScreenShotEffect::blitScreenshot(const QRect &geometry)
// copy content from framebuffer into image
tex.bind();
img = QImage(geometry.size(), QImage::Format_ARGB32);
#ifdef KWIN_HAVE_OPENGLES
glReadPixels(0, 0, img.width(), img.height(), GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid*)img.bits());
#else
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, (GLvoid*)img.bits());
#endif
tex.unbind();
ScreenShotEffect::convertFromGLImage(img, geometry.width(), geometry.height());
}
@ -269,7 +268,6 @@ QString ScreenShotEffect::blitScreenshot(const QRect &geometry)
#endif
temp.close();
return temp.fileName();
#endif
}
void ScreenShotEffect::grabPointerImage(QImage& snapshot, int offsetx, int offsety)