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

Use correct "natural" surface size when computing surface-to-buffer matrix

Browse source 
If the source rectangle is not set, we need to use the surface size
given by the attached buffer. It's computed as buffer size / scale, but
the buffer can also be transformed. In other words, we need to compute
the natural surface size as follows - buffer size / scale and transpose
the result if the buffer is rotated 90 or 270 degrees.
This commit is contained in:
Vlad Zahorodnii 2022-01-08 15:15:14 +02:00
parent 5475751c7b
commit 49aadee2a9
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/wayland/surface_interface.cpp
View file

@ -441,7 +441,7 @@ QMatrix4x4 SurfaceInterfacePrivate::buildSurfaceToBufferMatrix()
if (current.viewport.sourceGeometry.isValid()) {
sourceSize = current.viewport.sourceGeometry.size();
} else {
sourceSize = bufferSize / current.bufferScale;
sourceSize = implicitSurfaceSize;
}
if (sourceSize != surfaceSize) {
@ -556,28 +556,32 @@ void SurfaceInterfacePrivate::applyState(SurfaceState *next)
// TODO: Refactor the state management code because it gets more clumsy.
if (current.buffer) {
bufferSize = current.buffer->size();
implicitSurfaceSize = current.buffer->size() / current.bufferScale;
switch (current.bufferTransform) {
case OutputInterface::Transform::Rotated90:
case OutputInterface::Transform::Rotated270:
case OutputInterface::Transform::Flipped90:
case OutputInterface::Transform::Flipped270:
implicitSurfaceSize.transpose();
break;
case OutputInterface::Transform::Normal:
case OutputInterface::Transform::Rotated180:
case OutputInterface::Transform::Flipped:
case OutputInterface::Transform::Flipped180:
break;
}
if (current.viewport.destinationSize.isValid()) {
surfaceSize = current.viewport.destinationSize;
} else if (current.viewport.sourceGeometry.isValid()) {
surfaceSize = current.viewport.sourceGeometry.size().toSize();
} else {
surfaceSize = current.buffer->size() / current.bufferScale;
switch (current.bufferTransform) {
case OutputInterface::Transform::Rotated90:
case OutputInterface::Transform::Rotated270:
case OutputInterface::Transform::Flipped90:
case OutputInterface::Transform::Flipped270:
surfaceSize.transpose();
break;
case OutputInterface::Transform::Normal:
case OutputInterface::Transform::Rotated180:
case OutputInterface::Transform::Flipped:
case OutputInterface::Transform::Flipped180:
break;
}
surfaceSize = implicitSurfaceSize;
}
} else {
surfaceSize = QSize();
implicitSurfaceSize = QSize();
bufferSize = QSize();
}

1
src/wayland/surface_interface_p.h
View file

@ -104,6 +104,7 @@ public:
QMatrix4x4 surfaceToBufferMatrix;
QMatrix4x4 bufferToSurfaceMatrix;
QSize bufferSize;
QSize implicitSurfaceSize;
QSize surfaceSize;
QRegion inputRegion;
ClientBuffer *bufferRef = nullptr;