haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed OPENGL_GAL::instanceCounter.

This commit is contained in:
Maciej Suminski 2016-06-03 15:46:12 +02:00
parent 94a460080e
commit 68b6da57c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/gal/opengl/opengl_gal.cpp
View File

@ -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 );

1
include/gal/opengl/opengl_gal.h
View File

@ -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)