mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4424 from manuelVo/fix-opengl

Browse Source 
Defer instantiation of TextureCache until OpenGL is initialized
This commit is contained in:
Ted John
2016-09-13 19:45:24 +01:00
committed by GitHub
parent 73b7f3c9f4 f7caa55ee1
commit 3191c421af
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/drawing/NewDrawing.cpp
View File

@@ -92,11 +92,13 @@ extern "C"
if (_drawingEngineType == DRAWING_ENGINE_SOFTWARE)
{
_drawingEngineType = DRAWING_ENGINE_NONE;
log_error(ex.GetMessage());
log_fatal("Unable to initialise a drawing engine.");
exit(-1);
}
else
{
log_error(ex.GetMessage());
log_error("Unable to initialise drawing engine. Falling back to software.");
// Fallback to software

2
src/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@@ -503,7 +503,6 @@ IDrawingEngine * DrawingEngineFactory::CreateOpenGL()
OpenGLDrawingContext::OpenGLDrawingContext(OpenGLDrawingEngine * engine)
{
_engine = engine;
_textureCache = new TextureCache();
}
OpenGLDrawingContext::~OpenGLDrawingContext()
@@ -522,6 +521,7 @@ IDrawingEngine * OpenGLDrawingContext::GetEngine()
void OpenGLDrawingContext::Initialise()
{
_textureCache = new TextureCache();
_drawImageShader = new DrawImageShader();
_drawLineShader = new DrawLineShader();
_fillRectShader = new FillRectShader();