mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-03 21:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Setup GL context in main thread (macOS 10.15 requires it)

Browse source
This commit is contained in:
Inori 2019-10-17 08:44:21 -04:00 • committed by Inori
parent f57186f7a5
commit 1e63c65c73
3 changed files with 54 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/eventthread.h
View file

@ -260,6 +260,8 @@ struct RGSSThreadData
SDL_Window *window;
ALCdevice *alcDev;
SDL_GLContext glContext;
Vec2 sizeResoRatio;
Vec2i screenOffset;
@ -274,14 +276,16 @@ struct RGSSThreadData
SDL_Window *window,
ALCdevice *alcDev,
int refreshRate,
const Config& newconf)
const Config& newconf,
SDL_GLContext ctx)
: ethread(ethread),
argv0(argv0),
window(window),
alcDev(alcDev),
sizeResoRatio(1, 1),
refreshRate(refreshRate),
config(newconf)
config(newconf),
glContext(ctx)
{}
};

92
src/main.cpp
View file

@ -75,47 +75,6 @@ int rgssThreadFun(void *userdata)
RGSSThreadData *threadData = static_cast<RGSSThreadData*>(userdata);
const Config &conf = threadData->config;
SDL_Window *win = threadData->window;
SDL_GLContext glCtx;
/* Setup GL context */
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
if (conf.debugMode)
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
glCtx = SDL_GL_CreateContext(win);
if (!glCtx)
{
rgssThreadError(threadData, std::string("Error creating context: ") + SDL_GetError());
return 0;
}
try
{
initGLFunctions();
}
catch (const Exception &exc)
{
rgssThreadError(threadData, exc.msg);
SDL_GL_DeleteContext(glCtx);
return 0;
}
if (!conf.enableBlitting)
gl.BlitFramebuffer = 0;
gl.ClearColor(0, 0, 0, 1);
gl.Clear(GL_COLOR_BUFFER_BIT);
SDL_GL_SwapWindow(win);
printGLInfo();
bool vsync = conf.vsync || conf.syncToRefreshrate;
SDL_GL_SetSwapInterval(vsync ? 1 : 0);
GLDebugLogger dLogger;
/* Setup AL context */
ALCcontext *alcCtx = alcCreateContext(threadData->alcDev, 0);
@ -123,8 +82,6 @@ int rgssThreadFun(void *userdata)
if (!alcCtx)
{
rgssThreadError(threadData, "Error creating OpenAL context");
SDL_GL_DeleteContext(glCtx);
return 0;
}
@ -138,7 +95,6 @@ int rgssThreadFun(void *userdata)
{
rgssThreadError(threadData, exc.msg);
alcDestroyContext(alcCtx);
SDL_GL_DeleteContext(glCtx);
return 0;
}
@ -152,7 +108,6 @@ int rgssThreadFun(void *userdata)
SharedState::finiInstance();
alcDestroyContext(alcCtx);
SDL_GL_DeleteContext(glCtx);
return 0;
}
@ -358,8 +313,52 @@ int main(int argc, char *argv[])
conf.syncToRefreshrate = false;
EventThread eventThread;
SDL_GLContext glCtx{};
/* Setup GL context. Must be done in main thread since macOS 10.15 */
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
if (conf.debugMode)
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
glCtx = SDL_GL_CreateContext(win);
if (!glCtx)
{
showInitError(std::string("Error creating context: ") + SDL_GetError());
return 0;
}
try
{
initGLFunctions();
}
catch (const Exception &exc)
{
showInitError(exc.msg);
SDL_GL_DeleteContext(glCtx);
return 0;
}
if (!conf.enableBlitting)
gl.BlitFramebuffer = 0;
gl.ClearColor(0, 0, 0, 1);
gl.Clear(GL_COLOR_BUFFER_BIT);
SDL_GL_SwapWindow(win);
printGLInfo();
bool vsync = conf.vsync || conf.syncToRefreshrate;
SDL_GL_SetSwapInterval(vsync ? 1 : 0);
GLDebugLogger dLogger;
RGSSThreadData rtData(&eventThread, argv[0], win,
alcDev, mode.refresh_rate, conf);
alcDev, mode.refresh_rate, conf, glCtx);
int winW, winH;
SDL_GetWindowSize(win, &winW, &winH);
@ -412,6 +411,7 @@ int main(int argc, char *argv[])
Debug() << "Shutting down.";
SDL_GL_DeleteContext(glCtx);
alcCloseDevice(alcDev);
SDL_DestroyWindow(win);

3
src/sharedstate.cpp
View file

@ -184,7 +184,8 @@ void SharedState::initInstance(RGSSThreadData *threadData)
* Font depends on SharedState existing */
rgssVersion = threadData->config.rgssVersion;
SDL_GL_MakeCurrent(threadData->window, threadData->glContext);
_globalIBO = new GlobalIBO();
_globalIBO->ensureSize(1);