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

opengl: Correct transformation order in GLTexture::render()

Browse source 
First, the texture-to-buffer transform has to be applied, then the y
axis should be flipped. Doing it vice versa changes the winding order
of rotation transforms.

Also the screenshot plugin uses incorrect render transform. Since
convertFromGLImage() undoes the render target's transform, the color
space transformation pass should use the same transform, not the
inverted one.

BUG: 479934
This commit is contained in:
Vlad Zahorodnii 2024-01-17 16:19:44 +02:00
parent 69f8bee0b1
commit f23e0ef05b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/opengl/gltexture.cpp
View file

@ -360,9 +360,9 @@ void GLTexture::render(const QRectF &source, const QRegion &region, const QSizeF
QMatrix4x4 textureMat;
textureMat.translate(texWidth / 2, texHeight / 2);
textureMat *= d->m_textureToBufferTransform.toMatrix();
// our Y axis is flipped vs OpenGL
textureMat.scale(1, -1);
textureMat *= d->m_textureToBufferTransform.toMatrix();
textureMat.translate(-texWidth / 2, -texHeight / 2);
textureMat.scale(texWidth / rotatedSize.width(), texHeight / rotatedSize.height());

5
src/plugins/screenshot/screenshot.cpp
View file

@ -386,7 +386,10 @@ QImage ScreenShotEffect::blitScreenshot(const RenderTarget &renderTarget, const
GLFramebuffer::pushFramebuffer(&target);
ShaderBinder binder(ShaderTrait::MapTexture | ShaderTrait::TransformColorspace);
binder.shader()->setColorspaceUniformsToSRGB(renderTarget.colorDescription());
QMatrix4x4 projectionMatrix = renderTarget.texture()->contentTransform().inverted().toMatrix();
QMatrix4x4 projectionMatrix;
projectionMatrix.scale(1, -1);
projectionMatrix *= renderTarget.transform().toMatrix();
projectionMatrix.scale(1, -1);
projectionMatrix.ortho(QRect(QPoint(), nativeSize));
binder.shader()->setUniform(GLShader::ModelViewProjectionMatrix, projectionMatrix);
renderTarget.texture()->render(viewport.mapToRenderTargetTexture(geometry), infiniteRegion(), nativeSize);