From 2045e8dd348c09b4a1e50ad2ddb44db653beac31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Fri, 11 Feb 2011 00:41:19 +0100 Subject: [PATCH] kwin: Use the new setUniform() overloads in presentwindows --- effects/presentwindows/presentwindows.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index 887d6d84d8..12a3f35cee 100644 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -324,9 +324,9 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region m_windowData[w].iconFrame->setPosition(point); #ifdef KWIN_HAVE_OPENGL_COMPOSITING if (effects->compositingType() == KWin::OpenGLCompositing && data.shader) { - data.shader->setUniform("textureWidth", 1.0f); - data.shader->setUniform("textureHeight", 1.0f); - data.shader->setUniform("opacity", (float)(0.9 * data.opacity * m_decalOpacity * 0.75)); + data.shader->setUniform(GLShader::TextureWidth, 1.0f); + data.shader->setUniform(GLShader::TextureHeight, 1.0f); + data.shader->setUniform(GLShader::Opacity, 0.9 * data.opacity * m_decalOpacity * 0.75); } #endif m_windowData[w].iconFrame->render(region, 0.9 * data.opacity * m_decalOpacity, 0.75); @@ -337,9 +337,9 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region m_windowData[w].textFrame->setPosition(point); #ifdef KWIN_HAVE_OPENGL_COMPOSITING if (effects->compositingType() == KWin::OpenGLCompositing && data.shader) { - data.shader->setUniform("textureWidth", 1.0f); - data.shader->setUniform("textureHeight", 1.0f); - data.shader->setUniform("opacity", (float)(0.9 * data.opacity * m_decalOpacity * 0.75)); + data.shader->setUniform(GLShader::TextureWidth, 1.0f); + data.shader->setUniform(GLShader::TextureHeight, 1.0f); + data.shader->setUniform(GLShader::Opacity, 0.9 * data.opacity * m_decalOpacity * 0.75); } #endif m_windowData[w].textFrame->render(region, 0.9 * data.opacity * m_decalOpacity, 0.75);