Added some extra checking for selection texture creation

Change-Id: Iedeaa2581c32b6d46168568fef736b234ac17e95
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

4 files changed, 30 insertions, 12 deletions

diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index f8750b17..f909c7d6 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -1117,7 +1117,8 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
     // Skip selection mode drawing if we're slicing or have no selection mode
     if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
             && m_selectionState == SelectOnScene
-            && (m_visibleSeriesCount > 0 || !m_customRenderCache.isEmpty())) {
+            && (m_visibleSeriesCount > 0 || !m_customRenderCache.isEmpty())
+            && m_selectionTexture) {
         // Bind selection shader
         m_selectionShader->bind();
 
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index dd50188b..7ac81552 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -551,7 +551,8 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
     // Skip selection mode drawing if we have no selection mode
     if (m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
             && SelectOnScene == m_selectionState
-            && (m_visibleSeriesCount > 0 || !m_customRenderCache.isEmpty())) {
+            && (m_visibleSeriesCount > 0 || !m_customRenderCache.isEmpty())
+            && m_selectionTexture) {
         // Draw dots to selection buffer
         glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer);
         glViewport(0, 0,
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 38c8d8fe..60e57529 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -1190,7 +1190,8 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
     if (!m_cachedIsSlicingActivated && (!m_renderCacheList.isEmpty()
                                         || !m_customRenderCache.isEmpty())
             && m_selectionState == SelectOnScene
-            && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone) {
+            && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
+            && m_selectionResultTexture) {
         m_selectionShader->bind();
         glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer);
         glViewport(0,
@@ -2690,10 +2691,12 @@ void Surface3DRenderer::updateDepthBuffer()
         m_depthTexture = m_textureHelper->createDepthTextureFrameBuffer(m_primarySubViewport.size(),
                                                                         m_depthFrameBuffer,
                                                                         m_shadowQualityMultiplier);
-        m_textureHelper->fillDepthTexture(m_depthTexture, m_primarySubViewport.size(),
-                                          m_shadowQualityMultiplier, 1.0f);
-        m_depthModelTexture = m_textureHelper->createDepthTexture(m_primarySubViewport.size(),
-                                                                  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);
+        }
         if (!m_depthTexture || !m_depthModelTexture)
             lowerShadowQuality();
     }
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 2a2a89dd..97f9c672 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -116,11 +116,22 @@ GLuint TextureHelper::createSelectionTexture(const QSize &size, GLuint &frameBuf
     if (!depthBuffer)
         glGenRenderbuffers(1, &depthBuffer);
     glBindRenderbuffer(GL_RENDERBUFFER, depthBuffer);
+    GLenum status = glGetError();
+    // glGetError docs advise to call glGetError in loop to clear all error flags
+    while (status)
+        status = glGetError();
 #if !defined(QT_OPENGL_ES_2)
     glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, size.width(), size.height());
 #else
     glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, size.width(), size.height());
 #endif
+    status = glGetError();
+    if (status) {
+        qCritical() << "Selection texture render buffer creation failed:" << status;
+        glDeleteTextures(1, &textureid);
+        glBindRenderbuffer(GL_RENDERBUFFER, 0);
+        return 0;
+    }
     glBindRenderbuffer(GL_RENDERBUFFER, 0);
 
     // Create frame buffer
@@ -134,10 +145,11 @@ GLuint TextureHelper::createSelectionTexture(const QSize &size, GLuint &frameBuf
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthBuffer);
 
     // Verify that the frame buffer is complete
-    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+    status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
     if (status != GL_FRAMEBUFFER_COMPLETE) {
-        qCritical() << "Frame buffer creation failed" << status;
-        return 0;
+        qCritical() << "Selection texture frame buffer creation failed:" << status;
+        glDeleteTextures(1, &textureid);
+        textureid = 0;
     }
 
     // Restore the default framebuffer
@@ -212,8 +224,9 @@ GLuint TextureHelper::createDepthTextureFrameBuffer(const QSize &size, GLuint &f
     // Verify that the frame buffer is complete
     GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
     if (status != GL_FRAMEBUFFER_COMPLETE) {
-        qCritical() << "Frame buffer creation failed" << status;
-        return 0;
+        qCritical() << "Depth texture frame buffer creation failed" << status;
+        glDeleteTextures(1, &depthtextureid);
+        depthtextureid = 0;
     }
 
     // Restore the default framebuffer