MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash with GL_DEBUG enabled with mupen64plus API

Browse Source 
Also, fix compiler warning
This commit is contained in:
Francisco Zurita 2019-04-14 13:17:16 -04:00 committed by Sergey Lipskiy
parent a221db45cd
commit 8f26645407
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_ObjectPool.h
View File

@ -41,6 +41,6 @@ namespace opengl {
private: private:
std::vector<std::vector<std::shared_ptr<PoolObject>>> m_objectPool; std::vector<std::vector<std::shared_ptr<PoolObject>>> m_objectPool;
std::vector<int> m_objectPoolIndex; std::vector<unsigned int> m_objectPoolIndex;
}; };
} }

2
src/Graphics/OpenGLContext/ThreadedOpenGl/opengl_Wrapper.cpp
View File

@ -1346,10 +1346,12 @@ namespace opengl {
m_shutdown = true; m_shutdown = true;
#ifndef GL_DEBUG
if (m_threaded_wrapper) { if (m_threaded_wrapper) {
m_condition.notify_all(); m_condition.notify_all();
m_commandExecutionThread.join(); m_commandExecutionThread.join();
} }
#endif
} }
m64p_error FunctionWrapper::CoreVideo_SetVideoMode(int screenWidth, int screenHeight, int bitsPerPixel, m64p_video_mode mode, m64p_video_flags flags) m64p_error FunctionWrapper::CoreVideo_SetVideoMode(int screenWidth, int screenHeight, int bitsPerPixel, m64p_video_mode mode, m64p_video_flags flags)