got rid of a memory leak

src/shader.cpp

@@ -3,7 +3,6 @@
 Shader::Shader( std::string vert, std::string frag) {
     vert = resource->getRealPath(vert);
     frag = resource->getRealPath(frag);
-    m_good = false;
     // Create the program to link to.
     m_program = glCreateProgram();
 
@@ -64,7 +63,6 @@ Shader::Shader( std::string vert, std::string frag) {
     // Clean up :)
     glDeleteShader( vertShader );
     glDeleteShader( fragShader );
-    m_good = true;
     glUseProgram( 0 );
 }
 
@@ -119,45 +117,27 @@ int Shader::link( unsigned int vertshader, unsigned int fragshader, std::string&
 }
 
 unsigned int Shader::getUniformLocation( std::string name ) {
-    if ( !m_good ) {
-        return 0;
-    }
     glUseProgram( m_program );
     return glGetUniformLocation( m_program, name.c_str() );
 }
 
 void Shader::setParameter( std::string name, int foo ) {
-    if ( !m_good ) {
-        return;
-    }
     glUniform1i( getUniformLocation( name ), foo );
 }
 
 void Shader::setParameter( std::string name, float foo ) {
-    if ( !m_good ) {
-        return;
-    }
     glUniform1f( getUniformLocation( name ), foo );
 }
 
 void Shader::setParameter( std::string name, glm::mat4& foo ) {
-    if ( !m_good ) {
-        return;
-    }
     glUniformMatrix4fv( getUniformLocation( name ), 1, GL_FALSE, glm::value_ptr( foo ) );
 }
 
 void Shader::setParameter( std::string name, glm::vec4 foo ) {
-    if ( !m_good ) {
-        return;
-    }
     glUniform4f( getUniformLocation( name ), foo.x, foo.y, foo.z, foo.w );
 }
 
 void Shader::setParameter( std::string name, glm::vec2 foo ) {
-    if ( !m_good ) {
-        return;
-    }
     glUniform2f( getUniformLocation( name ), foo.x, foo.y );
 }
 

src/shader.hpp

@@ -49,7 +49,6 @@ public:
     void            setAttribute( std::string name, unsigned int buffer, unsigned int stepsize );
 private:
     std::vector<unsigned int>   m_activeattribs;
-    bool                        m_good;
     unsigned int                getUniformLocation( std::string );
     int                         compile( unsigned int shader, std::string& error );
     int                         link( unsigned int vert, unsigned int frag, std::string& error );

src/window.cpp

@@ -62,12 +62,8 @@ SlopWindow::SlopWindow() {
     }
     framebuffer = new Framebuffer( WidthOfScreen( x11->screen ), HeightOfScreen( x11->screen ) );
 
-    // Then we do a basic double clear (double buffered).
     glViewport( 0, 0, WidthOfScreen( x11->screen ), HeightOfScreen( x11->screen ) );
     camera = glm::ortho( 0.0f, (float)WidthOfScreen( x11->screen ), (float)HeightOfScreen( x11->screen ), 0.0f, -1.0f, 1.0f);
-    glClearColor( 0, 0, 0, 0 );
-    glClear( GL_COLOR_BUFFER_BIT );
-    display();
 
     // Make it so all input falls through
     XRectangle rect;
@@ -87,6 +83,7 @@ SlopWindow::~SlopWindow() {
     glClearColor( 0, 0, 0, 0 );
     glClear( GL_COLOR_BUFFER_BIT );
     display();
+    glXDestroyContext( x11->display, context );
     XDestroyWindow( x11->display, window );
 }