[kdebase-workspace/f16] fixup textures patch

[Rex Dieter]

commit be9ce8618c84df0ed534eaeb64db97551c609405
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 17 14:13:23 2011 -0500

    fixup textures patch

 kde-workspace-4.7.2-r300_textures.patch |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/kde-workspace-4.7.2-r300_textures.patch b/kde-workspace-4.7.2-r300_textures.patch
index 8739ea8..3b9bfd5 100644
--- a/kde-workspace-4.7.2-r300_textures.patch
+++ b/kde-workspace-4.7.2-r300_textures.patch
@@ -1,7 +1,6 @@
 From: Martin Gräßlin <mgraesslin at kde.org>
 Date: Sat, 15 Oct 2011 12:14:44 +0000
 Subject: Generate texture coordinates for limited NPOT support
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=230d5aee9bdc46c3a796a10b884685b4224ba732
 ---
 Generate texture coordinates for limited NPOT support
 
@@ -17,9 +16,11 @@ FIXED-IN: 4.7.3
 ---
 
 
---- a/kwin/libkwineffects/kwingltexture.cpp
-+++ b/kwin/libkwineffects/kwingltexture.cpp
-@@ -280,11 +280,18 @@ void GLTexture::render(QRegion region, c
+diff --git a/kwin/libkwineffects/kwinglutils.cpp b/kwin/libkwineffects/kwinglutils.cpp
+index 87a4625..b151762 100644
+--- a/kwin/libkwineffects/kwinglutils.cpp
++++ b/kwin/libkwineffects/kwinglutils.cpp
+@@ -444,11 +444,18 @@ void GLTexture::render(QRegion region, const QRect& rect)
              r.x() + rect.width(), r.y(),
              r.x() + rect.width(), r.y() + rect.height()
          };
@@ -31,15 +32,14 @@ FIXED-IN: 4.7.3
 +        const float texHeight = (target() == GL_TEXTURE_RECTANGLE_ARB) ? height() : 1.0f;
 +#endif
          const float texcoords[ 4 * 2 ] = {
--            0.0f, d->m_yInverted ? 0.0f : 1.0f, // y needs to be swapped (normalized coords)
--            0.0f, d->m_yInverted ? 1.0f : 0.0f,
--            1.0f, d->m_yInverted ? 0.0f : 1.0f,
--            1.0f, d->m_yInverted ? 1.0f : 0.0f
-+            0.0f, d->m_yInverted ? 0.0f : texHeight, // y needs to be swapped (normalized coords)
-+            0.0f, d->m_yInverted ? texHeight : 0.0f,
-+            texWidth, d->m_yInverted ? 0.0f : texHeight,
-+            texWidth, d->m_yInverted ? texHeight : 0.0f
+-            0.0f, y_inverted ? 0.0f : 1.0f, // y needs to be swapped (normalized coords)
+-            0.0f, y_inverted ? 1.0f : 0.0f,
+-            1.0f, y_inverted ? 0.0f : 1.0f,
+-            1.0f, y_inverted ? 1.0f : 0.0f
++            0.0f, y_inverted ? 0.0f : texHeight, // y needs to be swapped (normalized coords)
++            0.0f, y_inverted ? texHeight : 0.0f,
++            texWidth, y_inverted ? 0.0f : texHeight,
++            texWidth, y_inverted ? texHeight : 0.0f
          };
-         d->m_vbo->setData(4, 2, verts, texcoords);
+         m_vbo->setData(4, 2, verts, texcoords);
      }
-