summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2014-07-04 11:12:06 +0300
committerMika Salmela <mika.salmela@digia.com>2014-07-04 11:16:26 +0300
commit9c3b9fb2d8f07b2b3f2e5bc84653711043c9936c (patch)
tree85954851f1e31da4b20646671cb44c9228b2ba52
parenteda443e725d94dca2782d48cfd19380257d19ba2 (diff)
Remove obsolete fillDepthTexture function
Not needed anymore. The m_noShadowTexture takes care of this. Task-number: QTRD-3212 Change-Id: I30d8b6a9cfa7561914c4210cb7334d8ef8a4cca8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp2
-rw-r--r--src/datavisualization/utils/texturehelper.cpp18
-rw-r--r--src/datavisualization/utils/texturehelper_p.h1
3 files changed, 0 insertions, 21 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index a30239f7..96574807 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -2917,8 +2917,6 @@ void Surface3DRenderer::updateDepthBuffer()
m_depthFrameBuffer,
m_shadowQualityMultiplier);
if (m_depthTexture) {
- m_textureHelper->fillDepthTexture(m_depthTexture, m_primarySubViewport.size(),
- m_shadowQualityMultiplier, 1.0f);
m_depthModelTexture = m_textureHelper->createDepthTexture(m_primarySubViewport.size(),
m_shadowQualityMultiplier);
}
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 97f9c672..616c1981 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -236,24 +236,6 @@ GLuint TextureHelper::createDepthTextureFrameBuffer(const QSize &size, GLuint &f
}
#endif
-#if !defined(QT_OPENGL_ES_2)
-void TextureHelper::fillDepthTexture(GLuint texture,const QSize &size, GLuint textureSize,
- GLfloat value)
-{
- int nItems = size.width() * textureSize * size.height() * textureSize;
- GLfloat *bits = new GLfloat[nItems];
- for (int i = 0; i < nItems; i++)
- bits[i] = value;
-
- glBindTexture(GL_TEXTURE_2D, texture);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, size.width() * textureSize,
- size.height() * textureSize, 0, GL_DEPTH_COMPONENT, GL_FLOAT, bits);
- glBindTexture(GL_TEXTURE_2D, 0);
-
- delete[] bits;
-}
-#endif
-
void TextureHelper::deleteTexture(GLuint *texture)
{
if (texture && *texture) {
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index aec137a4..c20f293c 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -53,7 +53,6 @@ class TextureHelper : protected QOpenGLFunctions
GLuint createDepthTexture(const QSize &size, GLuint textureSize);
// Returns depth texture and inserts generated framebuffer to parameter
GLuint createDepthTextureFrameBuffer(const QSize &size, GLuint &frameBuffer, GLuint textureSize);
- void fillDepthTexture(GLuint texture, const QSize &size, GLuint textureSize, GLfloat value);
#endif
void deleteTexture(GLuint *texture);