Merge branch 'Plasma/5.11'

icc-effect-5.14.5
David Edmundson 2017-10-26 01:07:49 +01:00
commit 20db59ac1f
2 changed files with 2 additions and 2 deletions

View File

@ -194,7 +194,7 @@ bool EglGbmBackend::makeContextCurrent(const Output &output)
qreal scale = output.output->scale();
glViewport(-v.x() * scale, (v.height() - overall.height() - v.y()) * scale,
glViewport(-v.x() * scale, (v.height() - overall.height() + v.y()) * scale,
overall.width() * scale, overall.height() * scale);
return true;
}

View File

@ -108,7 +108,7 @@ void EglX11Backend::setupViewport(int screenId)
// TODO: are the values correct?
qreal scale = screens()->scale(screenId);
glViewport(-v.x(), v.height() - overall.height() - v.y(), overall.width() * scale, overall.height() * scale);
glViewport(-v.x(), v.height() - overall.height() + v.y(), overall.width() * scale, overall.height() * scale);
}
void EglX11Backend::endRenderingFrameForScreen(int screenId, const QRegion &renderedRegion, const QRegion &damagedRegion)