From: Eleni Maria Stea Date: Thu, 8 Mar 2018 09:00:58 +0000 (+0200) Subject: accidentally linked twice, removed second link_program X-Git-Url: https://eleni.mutantstargoat.com/git/?p=gl4;a=commitdiff_plain;h=c33d4600fdd4bcb0acdc9c8b2d0578106a0def34 accidentally linked twice, removed second link_program delete ubo at cleanup --- diff --git a/main.c b/main.c index 0c956e2..de73cdc 100644 --- a/main.c +++ b/main.c @@ -130,11 +130,6 @@ int init(void) } #endif - if(link_program(sdr) == -1) { - fprintf(stderr, "failed to bind attribute locations\n"); - return -1; - } - glUseProgram(sdr); glGenBuffers(1, &ubo_matrix); @@ -156,6 +151,7 @@ void cleanup(void) glDeleteVertexArrays(1, &torus.vao); } glDeleteTextures(1, &tex); + glDeleteBuffers(1, &ubo_matrix); } void display(void) @@ -475,6 +471,10 @@ unsigned int load_program(const char *vfname, const char *pfname) glDeleteProgram(prog); return 0; } + + glDetachShader(prog, vs); + glDetachShader(prog, ps); + return prog; }