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

Restore fbo binding after updating surface texture from EGLStreams

Browse source 
Currently, data from client buffer EGLStream is copied to a surface
texture. An fbo is used for that purpose. The main issue with it is that
it doesn't restore the old framebuffer binding.

The surface texture can be updated in the middle of a compositing cycle.

If the framebuffer binding is not restored, any window that must be
rendered in an offscreen texture won't be rendered to the offscreen
texture.

This change makes EglStreamSurfaceTextureWayland restore the fbo binding
so the DeformEffect and software screen rotation work as expected with
the proprietary NVIDIA driver.

BUG: 442697
This commit is contained in:
Vlad Zahorodnii 2021-09-21 12:29:17 +03:00
parent 595c7a7edc
commit 2200febcd6
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/plugins/platforms/drm/egl_stream_backend.cpp
View file

@ -627,6 +627,11 @@ void EglStreamSurfaceTextureWayland::createFbo()
glDeleteRenderbuffers(1, &m_rbo); glDeleteRenderbuffers(1, &m_rbo);
glDeleteFramebuffers(1, &m_fbo); glDeleteFramebuffers(1, &m_fbo);
GLuint oldReadFbo = 0;
GLuint oldDrawFbo = 0;
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, reinterpret_cast<GLint *>(&oldReadFbo));
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, reinterpret_cast<GLint *>(&oldDrawFbo));
glGenFramebuffers(1, &m_fbo); glGenFramebuffers(1, &m_fbo);
glBindFramebuffer(GL_FRAMEBUFFER, m_fbo); glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
glGenRenderbuffers(1, &m_rbo); glGenRenderbuffers(1, &m_rbo);
@ -634,17 +639,20 @@ void EglStreamSurfaceTextureWayland::createFbo()
glRenderbufferStorage(GL_RENDERBUFFER, m_format, m_texture->width(), m_texture->height()); glRenderbufferStorage(GL_RENDERBUFFER, m_format, m_texture->width(), m_texture->height());
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, m_rbo); glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, m_rbo);
glBindRenderbuffer(GL_RENDERBUFFER, 0); glBindRenderbuffer(GL_RENDERBUFFER, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, oldReadFbo);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, oldDrawFbo);
} }
// Renders the contents of the given EXTERNAL_OES texture // Renders the contents of the given EXTERNAL_OES texture
// to the scratch framebuffer, then copies this to m_texture // to the scratch framebuffer, then copies this to m_texture
void EglStreamSurfaceTextureWayland::copyExternalTexture(GLuint tex) void EglStreamSurfaceTextureWayland::copyExternalTexture(GLuint tex)
{ {
GLint oldViewport[4], oldProgram; GLint oldViewport[4], oldProgram, oldReadFbo, oldDrawFbo;
glGetIntegerv(GL_VIEWPORT, oldViewport); glGetIntegerv(GL_VIEWPORT, oldViewport);
glViewport(0, 0, m_texture->width(), m_texture->height()); glViewport(0, 0, m_texture->width(), m_texture->height());
glGetIntegerv(GL_CURRENT_PROGRAM, &oldProgram); glGetIntegerv(GL_CURRENT_PROGRAM, &oldProgram);
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, reinterpret_cast<GLint *>(&oldReadFbo));
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, reinterpret_cast<GLint *>(&oldDrawFbo));
glUseProgram(0); glUseProgram(0);
glBindFramebuffer(GL_FRAMEBUFFER, m_fbo); glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
glBindRenderbuffer(GL_RENDERBUFFER, m_rbo); glBindRenderbuffer(GL_RENDERBUFFER, m_rbo);
@ -670,7 +678,8 @@ void EglStreamSurfaceTextureWayland::copyExternalTexture(GLuint tex)
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0); glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
glBindRenderbuffer(GL_RENDERBUFFER, 0); glBindRenderbuffer(GL_RENDERBUFFER, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, oldReadFbo);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, oldDrawFbo);
glUseProgram(oldProgram); glUseProgram(oldProgram);
glViewport(oldViewport[0], oldViewport[1], oldViewport[2], oldViewport[3]); glViewport(oldViewport[0], oldViewport[1], oldViewport[2], oldViewport[3]);
} }