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

[effects/blur] Update blur to be more natural

Browse source 
Summary:
This gets rid of the dark area that may appear between very different colors by doing the blur in SRGB colorspace.
This is not enabled for GLES, and will use the previous blur type.

Test Plan:
Before:
{F6577457}

After:
{F6577458}

Reviewers: #vdg, #kwin, davidedmundson, zzag, fredrik, ngraham

Reviewed By: #vdg, fredrik, ngraham

Subscribers: Codezela, fredrik, abetts, Petross404, rapiteanu, filipf, rooty, ngraham, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18377
This commit is contained in:
Alex Nemeth 2019-01-31 18:39:48 +01:00 committed by Alex Nemeth
parent 4853228bc5
commit 3c2148a5fb
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
effects/blur/blur.cpp
View file

@ -126,8 +126,10 @@ void BlurEffect::updateTexture()
m_renderTargets.reserve(m_downSampleIterations + 2); m_renderTargets.reserve(m_downSampleIterations + 2);
m_renderTextures.reserve(m_downSampleIterations + 2); m_renderTextures.reserve(m_downSampleIterations + 2);
const GLenum textureFormat = GLPlatform::instance()->isGLES() ? GL_RGBA8 : GL_SRGB8_ALPHA8;
for (int i = 0; i <= m_downSampleIterations; i++) { for (int i = 0; i <= m_downSampleIterations; i++) {
m_renderTextures.append(GLTexture(GL_RGBA8, effects->virtualScreenSize() / (1 << i))); m_renderTextures.append(GLTexture(textureFormat, effects->virtualScreenSize() / (1 << i)));
m_renderTextures.last().setFilter(GL_LINEAR); m_renderTextures.last().setFilter(GL_LINEAR);
m_renderTextures.last().setWrapMode(GL_CLAMP_TO_EDGE); m_renderTextures.last().setWrapMode(GL_CLAMP_TO_EDGE);
@ -135,7 +137,7 @@ void BlurEffect::updateTexture()
} }
// This last set is used as a temporary helper texture // This last set is used as a temporary helper texture
m_renderTextures.append(GLTexture(GL_RGBA8, effects->virtualScreenSize())); m_renderTextures.append(GLTexture(textureFormat, effects->virtualScreenSize()));
m_renderTextures.last().setFilter(GL_LINEAR); m_renderTextures.last().setFilter(GL_LINEAR);
m_renderTextures.last().setWrapMode(GL_CLAMP_TO_EDGE); m_renderTextures.last().setWrapMode(GL_CLAMP_TO_EDGE);
@ -641,6 +643,8 @@ void BlurEffect::doBlur(const QRegion& shape, const QRect& screen, const float o
const QRegion expandedBlurRegion = expand(shape) & expand(screen); const QRegion expandedBlurRegion = expand(shape) & expand(screen);
const bool isGLES = GLPlatform::instance()->isGLES();
// Upload geometry for the down and upsample iterations // Upload geometry for the down and upsample iterations
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer(); GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
@ -662,10 +666,19 @@ void BlurEffect::doBlur(const QRegion& shape, const QRect& screen, const float o
*/ */
if (isDock) { if (isDock) {
m_renderTargets.last()->blitFromFramebuffer(sourceRect, destRect); m_renderTargets.last()->blitFromFramebuffer(sourceRect, destRect);
if (!isGLES) {
glEnable(GL_FRAMEBUFFER_SRGB);
}
copyScreenSampleTexture(vbo, blurRectCount, shape.translated(xTranslate, yTranslate), screenProjection); copyScreenSampleTexture(vbo, blurRectCount, shape.translated(xTranslate, yTranslate), screenProjection);
} else { } else {
m_renderTargets.first()->blitFromFramebuffer(sourceRect, destRect); m_renderTargets.first()->blitFromFramebuffer(sourceRect, destRect);
if (!isGLES) {
glEnable(GL_FRAMEBUFFER_SRGB);
}
// Remove the m_renderTargets[0] from the top of the stack that we will not use // Remove the m_renderTargets[0] from the top of the stack that we will not use
GLRenderTarget::popRenderTarget(); GLRenderTarget::popRenderTarget();
} }
@ -689,6 +702,10 @@ void BlurEffect::doBlur(const QRegion& shape, const QRect& screen, const float o
upscaleRenderToScreen(vbo, blurRectCount * (m_downSampleIterations + 1), shape.rectCount() * 6, screenProjection, windowRect.topLeft()); upscaleRenderToScreen(vbo, blurRectCount * (m_downSampleIterations + 1), shape.rectCount() * 6, screenProjection, windowRect.topLeft());
if (!isGLES) {
glDisable(GL_FRAMEBUFFER_SRGB);
}
if (opacity < 1.0) { if (opacity < 1.0) {
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }