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

platforms/drm: adjust how transforms are set

Browse source 
Instead of using setTransformInternal directly, have DrmOutput
set it in updateTransform, like with the other setters. Also use
updateTransform instead of setTransformInternal in DrmBackend, so
that hardware rotation can be used where possible.
This commit is contained in:
Xaver Hugl 2021-09-02 15:54:22 +02:00
parent 1af2067f40
commit e59f50e599
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/abstract_wayland_output.cpp
View file

@ -169,7 +169,6 @@ void AbstractWaylandOutput::applyChanges(const KWaylandServer::OutputChangeSetV2
if (changeSet->transformChanged()) {
qCDebug(KWIN_CORE) << "Server setting transform: " << (int)(changeSet->transform());
auto transform = outputDeviceTransformToKWinTransform(changeSet->transform());
setTransformInternal(transform);
updateTransform(transform);
emitModeChanged = true;
}

4
src/plugins/platforms/drm/drm_backend.cpp
View file

@ -502,7 +502,7 @@ void DrmBackend::readOutputsConfiguration()
if (const QJsonValue scale = outputInfo["scale"]; !scale.isUndefined()) {
(*it)->setScale(scale.toDouble(1.));
}
(*it)->setTransformInternal(KWinKScreenIntegration::toDrmTransform(outputInfo["rotation"].toInt()));
(*it)->updateTransform(KWinKScreenIntegration::toDrmTransform(outputInfo["rotation"].toInt()));
if (const QJsonObject mode = outputInfo["mode"].toObject(); !mode.isEmpty()) {
const QJsonObject size = mode["size"].toObject();
@ -510,7 +510,7 @@ void DrmBackend::readOutputsConfiguration()
}
} else {
(*it)->moveTo(pos);
(*it)->setTransformInternal(DrmOutput::Transform::Normal);
(*it)->updateTransform(DrmOutput::Transform::Normal);
}
pos.setX(pos.x() + (*it)->geometry().width());
}

1
src/plugins/platforms/drm/drm_output.cpp
View file

@ -305,6 +305,7 @@ DrmPlane::Transformations outputToPlaneTransform(DrmOutput::Transform transform)
void DrmOutput::updateTransform(Transform transform)
{
setTransformInternal(transform);
const auto planeTransform = outputToPlaneTransform(transform);
if (!qEnvironmentVariableIsSet("KWIN_DRM_SW_ROTATIONS_ONLY")
&& !m_pipeline->setTransformation(planeTransform)) {