haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted missing changes.

This commit is contained in:
Maciej Suminski 2014-11-13 16:37:15 +01:00
parent 7de3aa9af2
commit 90c7c72d81
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/gal/opengl/opengl_compositor.cpp
View File

@ -91,12 +91,10 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
{ {
wxASSERT( m_initialized ); wxASSERT( m_initialized );
unsigned int maxBuffers, maxWidth, maxHeight; unsigned int maxBuffers;
// Get the maximum size & number of buffers // Get the maximum number of buffers
glGetIntegerv( GL_MAX_COLOR_ATTACHMENTS, (GLint*) &maxBuffers ); glGetIntegerv( GL_MAX_COLOR_ATTACHMENTS, (GLint*) &maxBuffers );
glGetIntegerv( GL_MAX_FRAMEBUFFER_WIDTH, (GLint*) &maxWidth );
glGetIntegerv( GL_MAX_FRAMEBUFFER_HEIGHT, (GLint*) &maxHeight );
if( usedBuffers() >= maxBuffers ) if( usedBuffers() >= maxBuffers )
{ {
@ -106,14 +104,6 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
return 0; // Unfortunately we have no more free buffers left return 0; // Unfortunately we have no more free buffers left
} }
if( m_width > maxWidth || m_height > maxHeight ) {
DisplayError( NULL, wxString::Format( wxT( "Max handled framebuffer size is %d x %d,"
" but %x x %x is required." ),
maxWidth, maxHeight, m_width, m_height ) );
return 0;
}
// GL_COLOR_ATTACHMENTn are consecutive integers // GL_COLOR_ATTACHMENTn are consecutive integers
GLuint attachmentPoint = GL_COLOR_ATTACHMENT0 + usedBuffers(); GLuint attachmentPoint = GL_COLOR_ATTACHMENT0 + usedBuffers();
GLuint textureTarget; GLuint textureTarget;