From 32078ac8d8aa24aef6f5d826415e8615349af176 Mon Sep 17 00:00:00 2001 From: milek7 Date: Fri, 8 Apr 2022 02:03:59 +0200 Subject: [PATCH] fix delete conditions of gl resources as they are initialized to -1 --- openglparticles.h | 2 +- openglprecipitation.cpp | 6 +++--- openglskydome.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openglparticles.h b/openglparticles.h index aca20af5..267fffc4 100644 --- a/openglparticles.h +++ b/openglparticles.h @@ -18,7 +18,7 @@ public: opengl_particles() = default; // destructor ~opengl_particles() { - if( m_buffer != 0 ) { + if( m_buffer != -1 ) { ::glDeleteBuffers( 1, &m_buffer ); } } // methods void diff --git a/openglprecipitation.cpp b/openglprecipitation.cpp index c5ac8821..e06e1bc7 100644 --- a/openglprecipitation.cpp +++ b/openglprecipitation.cpp @@ -16,9 +16,9 @@ http://mozilla.org/MPL/2.0/. opengl_precipitation::~opengl_precipitation() { - if( m_vertexbuffer != 0 ) { ::glDeleteBuffers( 1, &m_vertexbuffer ); } - if( m_indexbuffer != 0 ) { ::glDeleteBuffers( 1, &m_indexbuffer ); } - if( m_uvbuffer != 0 ) { ::glDeleteBuffers( 1, &m_uvbuffer ); } + if( m_vertexbuffer != -1 ) { ::glDeleteBuffers( 1, &m_vertexbuffer ); } + if( m_indexbuffer != -1 ) { ::glDeleteBuffers( 1, &m_indexbuffer ); } + if( m_uvbuffer != -1 ) { ::glDeleteBuffers( 1, &m_uvbuffer ); } } void diff --git a/openglskydome.cpp b/openglskydome.cpp index 78288cf3..fd568fc4 100644 --- a/openglskydome.cpp +++ b/openglskydome.cpp @@ -14,9 +14,9 @@ http://mozilla.org/MPL/2.0/. opengl_skydome::~opengl_skydome() { - if( m_vertexbuffer != 0 ) { ::glDeleteBuffers( 1, &m_vertexbuffer ); } - if( m_indexbuffer != 0 ) { ::glDeleteBuffers( 1, &m_indexbuffer ); } - if( m_coloursbuffer != 0 ) { ::glDeleteBuffers( 1, &m_coloursbuffer ); } + if( m_vertexbuffer != -1 ) { ::glDeleteBuffers( 1, &m_vertexbuffer ); } + if( m_indexbuffer != -1 ) { ::glDeleteBuffers( 1, &m_indexbuffer ); } + if( m_coloursbuffer != -1 ) { ::glDeleteBuffers( 1, &m_coloursbuffer ); } } void opengl_skydome::update() { @@ -78,9 +78,9 @@ void opengl_skydome::update() { // render skydome to screen void opengl_skydome::render() { - if( ( m_indexbuffer == 0 ) || ( m_indexbuffer == (GLuint)-1 ) - || ( m_vertexbuffer == 0 ) || ( m_vertexbuffer == (GLuint)-1 ) - || ( m_coloursbuffer == 0 ) || ( m_coloursbuffer == (GLuint)-1 ) ) { + if( ( m_indexbuffer == (GLuint)-1 ) + || ( m_vertexbuffer == (GLuint)-1 ) + || ( m_coloursbuffer == (GLuint)-1 ) ) { return; } // setup: