From 92a30e08849f45fa6f5efb1dd8897a4a69c063a6 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 15 Feb 2020 02:03:07 +0100 Subject: Fix double free --- src/RenderBackend/OpenGL/ShaderProgram.cpp | 2 +- src/RenderBackend/OpenGL/Texture2D.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/RenderBackend') diff --git a/src/RenderBackend/OpenGL/ShaderProgram.cpp b/src/RenderBackend/OpenGL/ShaderProgram.cpp index 14b15aa..7990a82 100644 --- a/src/RenderBackend/OpenGL/ShaderProgram.cpp +++ b/src/RenderBackend/OpenGL/ShaderProgram.cpp @@ -12,7 +12,7 @@ namespace amalgine { ShaderProgram::~ShaderProgram() { - GLint numAttachedShaders; + GLint numAttachedShaders = 0; glGetProgramiv(program_id, GL_ATTACHED_SHADERS, &numAttachedShaders); GLuint *attachedShaders = new GLuint[numAttachedShaders]; diff --git a/src/RenderBackend/OpenGL/Texture2D.cpp b/src/RenderBackend/OpenGL/Texture2D.cpp index a561f6e..dcb9cef 100644 --- a/src/RenderBackend/OpenGL/Texture2D.cpp +++ b/src/RenderBackend/OpenGL/Texture2D.cpp @@ -7,10 +7,10 @@ namespace amalgine { struct TextureIdAllocator { TextureIdAllocator(){ - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units); + glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_texture_units); if(max_texture_units < 1) max_texture_units = 1; - printf("max texture units: %d\n", max_texture_units); + fprintf(stderr, "max texture units: %d\n", max_texture_units); } u32 get_free_texture_id() { -- cgit v1.2.3