From cc79e5ca834c99f65d025f5234f3c2b8a35edcfd Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Mon, 14 Oct 2013 11:39:21 +0200 Subject: [PATCH] Added error messages for OpenGL framebuffer errors. This should eliminate quiet segfaults in case of drivers that cannot handle multiple attachment points for framebuffers. --- common/gal/opengl/opengl_compositor.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/common/gal/opengl/opengl_compositor.cpp b/common/gal/opengl/opengl_compositor.cpp index 0a212af554..0dd5697191 100644 --- a/common/gal/opengl/opengl_compositor.cpp +++ b/common/gal/opengl/opengl_compositor.cpp @@ -95,8 +95,13 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer() { wxASSERT( m_initialized ); - if( m_buffers.size() >= m_maxBuffers ) + //if( usedBuffers() >= m_maxBuffers ) + { + wxLogError( wxT( "Cannot create more framebuffers. OpenGL rendering backend requires at" + "least 3 framebuffers. You may try to update/change " + "your graphic drivers." ) ); return 0; // Unfortunately we have no more free buffers left + } // GL_COLOR_ATTACHMENTn are consecutive integers GLuint attachmentPoint = GL_COLOR_ATTACHMENT0 + usedBuffers(); @@ -165,6 +170,8 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer() wxLogFatalError( wxT( "Cannot create the framebuffer." ) ); break; } + + return 0; } ClearBuffer(); @@ -218,6 +225,11 @@ void OPENGL_COMPOSITOR::ClearBuffer() void OPENGL_COMPOSITOR::DrawBuffer( unsigned int aBufferHandle ) { wxASSERT( m_initialized ); + if( aBufferHandle == 0 || aBufferHandle > usedBuffers() ) + { + wxLogError( wxT( "Wrong framebuffer handle" ) ); + return; + } // Switch to the main framebuffer and blit the scene glBindFramebuffer( GL_FRAMEBUFFER, DIRECT_RENDERING );