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

OpenGL: Create shaders for each GL 

Fixes: lp:1817284
* https://bugs.launchpad.net/kicad/+bug/1817284
This commit is contained in:
Seth Hillbrand 2019-02-25 04:51:02 -08:00
parent 787e410a55
commit 269f420f8d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,6 @@ wxGLContext* OPENGL_GAL::glMainContext = NULL;
int OPENGL_GAL::instanceCounter = 0;
GLuint OPENGL_GAL::fontTexture = 0;
bool OPENGL_GAL::isBitmapFontLoaded = false;
SHADER* OPENGL_GAL::shader = NULL;
namespace KIGFX {
class GL_BITMAP_CACHE
@ -215,7 +214,6 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
throw std::runtime_error( "Could not create the main OpenGL context" );
glPrivContext = glMainContext;
shader = new SHADER();
}
else
{
@ -225,6 +223,7 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
throw std::runtime_error( "Could not create a private OpenGL context" );
}
shader = new SHADER();
++instanceCounter;
bitmapCache.reset( new GL_BITMAP_CACHE );
@ -306,6 +305,8 @@ OPENGL_GAL::~OPENGL_GAL()
if( glPrivContext != glMainContext )
GL_CONTEXT_MANAGER::Get().DestroyCtx( glPrivContext );
delete shader;
// Are we destroying the last GAL instance?
if( instanceCounter == 0 )
{
@ -317,8 +318,6 @@ OPENGL_GAL::~OPENGL_GAL()
isBitmapFontLoaded = false;
}
delete shader;
GL_CONTEXT_MANAGER::Get().UnlockCtx( glMainContext );
GL_CONTEXT_MANAGER::Get().DestroyCtx( glMainContext );
glMainContext = NULL;

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

@ -312,7 +312,7 @@ private:
RENDER_TARGET currentTarget; ///< Current rendering target
// Shader
static SHADER* shader; ///< There is only one shader used for different objects
SHADER* shader; ///< There is only one shader used for different objects
// Internal flags
bool isFramebufferInitialized; ///< Are the framebuffers initialized?