From 68b6da57c02988462f6f2528811fd6dd79cd7807 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Fri, 3 Jun 2016 15:46:12 +0200
Subject: [PATCH] Removed OPENGL_GAL::instanceCounter.
---
common/gal/opengl/opengl_gal.cpp | 7 ++++---
include/gal/opengl/opengl_gal.h | 1 -
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp
index ff846b1cb8..0a7f5c2019 100644
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@@ -51,7 +51,6 @@ static void InitTesselatorCallbacks( GLUtesselator* aTesselator );
static const int glAttributes[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 8, 0 };
wxGLContext* OPENGL_GAL::glMainContext = NULL;
-int OPENGL_GAL::instanceCounter = 0;
GLuint OPENGL_GAL::fontTexture = 0;
bool OPENGL_GAL::isBitmapFontLoaded = false;
@@ -78,7 +77,6 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
// Check if OpenGL requirements are met
runTest();
- ++instanceCounter;
// Make VBOs use shaders
cachedManager.SetShader( shader );
@@ -144,13 +142,16 @@ OPENGL_GAL::~OPENGL_GAL()
ClearCache();
glFlush();
- if( --instanceCounter == 0 )
+ // Are destroying the last GAL instance?
+ if( glPrivContext == glMainContext )
{
if( isBitmapFontLoaded )
{
glDeleteTextures( 1, &fontTexture );
isBitmapFontLoaded = false;
}
+
+ glMainContext = NULL;
}
GL_CONTEXT_MANAGER::Get().UnlockCtx( glPrivContext );
diff --git a/include/gal/opengl/opengl_gal.h b/include/gal/opengl/opengl_gal.h
index f77de63c90..60430b6e3c 100644
--- a/include/gal/opengl/opengl_gal.h
+++ b/include/gal/opengl/opengl_gal.h
@@ -277,7 +277,6 @@ private:
wxGLContext* glPrivContext; ///< Canvas-specific OpenGL context
wxEvtHandler* mouseListener;
wxEvtHandler* paintListener;
- static int instanceCounter;
static GLuint fontTexture; ///< Bitmap font texture handle (shared)