From 8abf2b92cf0c9608ac922e96549a68652b7659c0 Mon Sep 17 00:00:00 2001 From: hgn Date: Mon, 15 Nov 2021 15:51:16 +0000 Subject: [PATCH] fixed invalid reads / some bugs --- build.sh | 2 +- fishladder.c | 4 ++-- vg/vg_shader.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 328e432..ab013e2 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ compile_models=false while (( "$#" )); do case $1 in -r|--release) - flags="-O3" + flags="-O3 -Wno-unused-function -DNO_STEAM" echo "Release mode" ;; -p|--play) diff --git a/fishladder.c b/fishladder.c index e3669a4..52752d5 100644 --- a/fishladder.c +++ b/fishladder.c @@ -1373,9 +1373,9 @@ void vg_render(void) // Draw splitters - for( int y = 0; y < world.h; y ++ ) + for( int y = 2; y < world.h-2; y ++ ) { - for( int x = 0; x < world.w; x ++ ) + for( int x = 2; x < world.w-2; x ++ ) { struct cell *cell = pcell((v2i){x,y}); diff --git a/vg/vg_shader.h b/vg/vg_shader.h index 8e17da3..ff8a5f0 100644 --- a/vg/vg_shader.h +++ b/vg/vg_shader.h @@ -84,7 +84,7 @@ static int vg_shader_compile( struct vg_shader *shader ) { vg_info( "Compile shader '%s'\n", shader->sym ); - GLuint vert, frag, geo; + GLuint vert, frag, geo = 0; vert = vg_shader_subshader( shader->src_vert, GL_VERTEX_SHADER ); frag = vg_shader_subshader( shader->src_frag, GL_FRAGMENT_SHADER ); @@ -101,7 +101,7 @@ static int vg_shader_compile( struct vg_shader *shader ) } shader->program = glCreateProgram(); - if( shader->src_geo ) + if( geo ) glAttachShader( shader->program, geo ); glAttachShader( shader->program, vert ); @@ -111,7 +111,7 @@ static int vg_shader_compile( struct vg_shader *shader ) glDeleteShader( vert ); glDeleteShader( frag ); - if( shader->src_geo ) + if( geo ) glDeleteShader( geo ); // Check for link errors -- 2.25.1