From 22b89612d26cf501f739d909e1f95b05f859d2be Mon Sep 17 00:00:00 2001
From: Jim Youngquist <jay@cs.uw.edu>
Date: Wed, 5 Oct 2016 09:03:58 -0700
Subject: [PATCH] Fix memory leak in tutorial02.cpp

---
 tutorial02_red_triangle/tutorial02.cpp | 51 ++++++++++++--------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/tutorial02_red_triangle/tutorial02.cpp b/tutorial02_red_triangle/tutorial02.cpp
index 47fc919..bf9165c 100644
--- a/tutorial02_red_triangle/tutorial02.cpp
+++ b/tutorial02_red_triangle/tutorial02.cpp
@@ -7,21 +7,24 @@ int main(int argc, const char **argv)
 {
         InitGraphics();
         printf("Screen started\n");
+
         // Create and compile our GLSL program from the shaders
-        GLuint programID = LoadShaders( "simplevertshader.glsl", "simplefragshader.glsl" );
+        GLuint programID = LoadShaders("simplevertshader.glsl",
+                                       "simplefragshader.glsl");
         printf("Shaders loaded\n");
 
-        GLfloat g_vertex_buffer_data[] = { 
+        GLfloat g_vertex_buffer_data[] = {
                 -1.0f, -1.0f, 0.0f,
                  1.0f, -1.0f, 0.0f,
                  0.0f,  1.0f, 0.0f,
         };
 
-   // Set the viewport 
-//   glViewport ( 0, 0, GScreenWidth, GScreenHeight );
+        // Set the viewport
+        glViewport ( 0, 0, GScreenWidth, GScreenHeight );
 
-        do{
+        void* image = malloc(GScreenWidth * GScreenHeight * 4);
 
+        do {
                 // Clear the screen
                 glClear( GL_COLOR_BUFFER_BIT );
 
@@ -29,33 +32,27 @@ int main(int argc, const char **argv)
                 glUseProgram(programID);
 
                 // 1rst attribute buffer : vertices
-//                glEnableVertexAttribArray(vertexPosition_modelspaceID);
-//                glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
                 glVertexAttribPointer(
-                        0, //vertexPosition_modelspaceID, // The attribute we want to configure
-                        3,                  // size
-                        GL_FLOAT,           // type
-                        GL_FALSE,           // normalized?
-                        0,                  // stride
-                        g_vertex_buffer_data // (void*)0            // array buffer offset
-                );
+                                0, //vertexPosition_modelspaceID, // The attribute we want to configure
+                                3,                  // size
+                                GL_FLOAT,           // type
+                                GL_FALSE,           // normalized?
+                                0,                  // stride
+                                g_vertex_buffer_data // (void*)0            // array buffer offset
+                                );
 
-// see above glEnableVertexAttribArray(vertexPosition_modelspaceID);
-   glEnableVertexAttribArray ( 0 );
+                // see above glEnableVertexAttribArray(vertexPosition_modelspaceID);
+                glEnableVertexAttribArray ( 0 );
 
                 // Draw the triangle !
-                glDrawArrays(GL_TRIANGLES, 0, 3); // 3 indices starting at 0 -> 1 triangle
-
-uint32_t GScreenWidth = 1920;
-uint32_t GScreenHeight = 1080;
-
-        void* image = malloc(GScreenWidth*GScreenHeight*4);
-        glBindFramebuffer(GL_FRAMEBUFFER,0);
-        glReadPixels(0,0,GScreenWidth,GScreenHeight, GL_RGBA, GL_UNSIGNED_BYTE, image); //GScreenWidth,GScreenHeight,
+                // 3 indices starting at 0 -> 1 triangle
+                glDrawArrays(GL_TRIANGLES, 0, 3);
 
-        updateScreen();
-        }
-        while(1);
+                glBindFramebuffer(GL_FRAMEBUFFER,0);
+                updateScreen();
 
+                glReadPixels(0, 0, GScreenWidth, GScreenHeight, GL_RGBA,
+                             GL_UNSIGNED_BYTE, image);
+        } while(1);
 }