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

[libkwineffects] OpenGL ES 3.0 supports glBlitFramebuffer

Browse source
This commit is contained in:
Martin Gräßlin 2015-06-24 09:39:02 +02:00
parent b8ae823b50
commit 59a6c9ddf9
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libkwineffects/kwinglutils.cpp
View file

@ -1296,7 +1296,7 @@ void GLRenderTarget::initStatic()
{ {
#ifdef KWIN_HAVE_OPENGLES #ifdef KWIN_HAVE_OPENGLES
sSupported = true; sSupported = true;
s_blitSupported = false; s_blitSupported = hasGLVersion(3, 0);
#else #else
sSupported = hasGLVersion(3, 0) || sSupported = hasGLVersion(3, 0) ||
hasGLExtension(QByteArrayLiteral("GL_ARB_framebuffer_object")) || hasGLExtension(QByteArrayLiteral("GL_ARB_framebuffer_object")) ||
@ -1488,11 +1488,6 @@ void GLRenderTarget::blitFromFramebuffer(const QRect &source, const QRect &desti
if (!GLRenderTarget::blitSupported()) { if (!GLRenderTarget::blitSupported()) {
return; return;
} }
#ifdef KWIN_HAVE_OPENGLES
Q_UNUSED(source)
Q_UNUSED(destination)
Q_UNUSED(filter)
#else
GLRenderTarget::pushRenderTarget(this); GLRenderTarget::pushRenderTarget(this);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mFramebuffer); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mFramebuffer);
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
@ -1503,7 +1498,6 @@ void GLRenderTarget::blitFromFramebuffer(const QRect &source, const QRect &desti
d.x(), mTexture.height() - d.y() - d.height(), d.x() + d.width(), mTexture.height() - d.y(), d.x(), mTexture.height() - d.y() - d.height(), d.x() + d.width(), mTexture.height() - d.y(),
GL_COLOR_BUFFER_BIT, filter); GL_COLOR_BUFFER_BIT, filter);
GLRenderTarget::popRenderTarget(); GLRenderTarget::popRenderTarget();
#endif
} }
void GLRenderTarget::attachTexture(const GLTexture& target) void GLRenderTarget::attachTexture(const GLTexture& target)