summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2013-11-07 15:20:22 +0200
committerMika Salmela <mika.salmela@digia.com>2013-11-08 11:18:28 +0200
commit8d01dc0ecaa0745c23b31b6c62eb46c6dad22356 (patch)
tree32c2dc1952d2ee2a433879b406c8f3e0eaedbd9b /src/datavisualization/utils
parent404885973ab4a4faa1679455370b86f5d02c8b97 (diff)
Shadow support for surface
Task-number: QTRD-2266 Change-Id: I99fd7a6eda570df3d114ab10a1b07c22736cc86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r--src/datavisualization/utils/texturehelper.cpp11
-rw-r--r--src/datavisualization/utils/texturehelper_p.h3
2 files changed, 12 insertions, 2 deletions
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index fd5061f2..cb18fcc2 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -168,7 +168,7 @@ GLuint TextureHelper::createGradientTexture(const QLinearGradient &gradient)
}
#if !defined(QT_OPENGL_ES_2)
-GLuint TextureHelper::createDepthTexture(const QSize &size, GLuint &frameBuffer, GLuint textureSize)
+GLuint TextureHelper::createDepthTexture(const QSize &size, GLuint textureSize)
{
GLuint depthtextureid;
@@ -185,6 +185,15 @@ GLuint TextureHelper::createDepthTexture(const QSize &size, GLuint &frameBuffer,
size.height() * textureSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
glBindTexture(GL_TEXTURE_2D, 0);
+ return depthtextureid;
+}
+#endif
+
+#if !defined(QT_OPENGL_ES_2)
+GLuint TextureHelper::createDepthTextureFrameBuffer(const QSize &size, GLuint &frameBuffer, GLuint textureSize)
+{
+ GLuint depthtextureid = createDepthTexture(size, textureSize);
+
// Create frame buffer
if (!frameBuffer)
glGenFramebuffers(1, &frameBuffer);
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index 97bd9e3d..84570a13 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -50,8 +50,9 @@ class TextureHelper : protected QOpenGLFunctions
GLuint createSelectionTexture(const QSize &size, GLuint &frameBuffer, GLuint &depthBuffer);
GLuint createGradientTexture(const QLinearGradient &gradient);
#if !defined(QT_OPENGL_ES_2)
+ GLuint createDepthTexture(const QSize &size, GLuint textureSize);
// Returns depth texture and inserts generated framebuffer to parameter
- GLuint createDepthTexture(const QSize &size, GLuint &frameBuffer, GLuint textureSize = 1);
+ GLuint createDepthTextureFrameBuffer(const QSize &size, GLuint &frameBuffer, GLuint textureSize);
#endif
void deleteTexture(const GLuint *texture);