Gradient support part 2

Scatter gradients.

Task-number: QTRD-2200
Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 8e556b44..fd5061f2 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -36,7 +36,7 @@ TextureHelper::~TextureHelper()
 }
 
 GLuint TextureHelper::create2DTexture(const QImage &image, bool useTrilinearFiltering,
-                                      bool convert, bool smoothScale)
+                                      bool convert, bool smoothScale, bool clampY)
 {
     if (image.isNull())
         return 0;
@@ -74,6 +74,8 @@ GLuint TextureHelper::create2DTexture(const QImage &image, bool useTrilinearFilt
     } else {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     }
+    if (clampY)
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glBindTexture(GL_TEXTURE_2D, 0);
     return textureId;
 }
@@ -162,7 +164,7 @@ GLuint TextureHelper::createGradientTexture(const QLinearGradient &gradient)
     pmp.setPen(Qt::NoPen);
     pmp.drawRect(0, 0, int(gradientTextureWidth), int(gradientTextureHeight));
 
-    return create2DTexture(image, false, true);
+    return create2DTexture(image, false, true, false, true);
 }
 
 #if !defined(QT_OPENGL_ES_2)
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index b2657083..97bd9e3d 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -44,7 +44,7 @@ class TextureHelper : protected QOpenGLFunctions
 
     // Ownership of created texture is transferred to caller
     GLuint create2DTexture(const QImage &image, bool useTrilinearFiltering = false,
-                           bool convert = true, bool smoothScale = true);
+                           bool convert = true, bool smoothScale = true, bool clampY = false);
     GLuint createCubeMapTexture(const QImage &image, bool useTrilinearFiltering = false);
     // Returns selection texture and inserts generated framebuffers to framebuffer parameters
     GLuint createSelectionTexture(const QSize &size, GLuint &frameBuffer, GLuint &depthBuffer);