piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-06-28 18:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

* move GL init to main thread

Browse Source 
* fix potential bug causing the screen bitmap to be created twice
This commit is contained in:
Arisotura
2019-04-01 04:50:48 +02:00
parent 2d0d501d1f
commit 1f13d9ce80
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libui_sdl/main.cpp
View File

@ -60,6 +60,7 @@ char* EmuDirectory;
uiWindow* MainWindow;
uiArea* MainDrawArea;
uiGLContext* GLContext;
int WindowWidth, WindowHeight;
@ -392,14 +393,7 @@ void FeedMicInput()
int EmuThreadFunc(void* burp)
{
// TODO: fail gracefully, support older OpenGL, etc
uiGLContext* glctx = uiGLNewContext(uiControl(MainDrawArea), 4, 3); // haw haw haw
uiGLMakeContextCurrent(glctx);
void* testor = uiGLGetProcAddress("glUseProgram");
void* testor2 = uiGLGetProcAddress("glBindFramebuffer");
printf("OPENGL: %p %p\n", testor, testor2);
uiGLMakeContextCurrent(GLContext);
NDS::Init();
MainScreenPos[0] = 0;
@ -407,7 +401,6 @@ int EmuThreadFunc(void* burp)
MainScreenPos[2] = 0;
AutoScreenSizing = 0;
ScreenDrawInited = false;
Touching = false;
KeyInputMask = 0xFFF;
HotkeyMask = 0;
@ -440,6 +433,8 @@ int EmuThreadFunc(void* burp)
{
EmuStatus = 1;
uiGLMakeContextCurrent(GLContext);
SDL_JoystickUpdate();
if (Joystick)
@ -624,8 +619,6 @@ int EmuThreadFunc(void* burp)
NDS::DeInit();
Platform::LAN_DeInit();
uiGLFreeContext(glctx);
return 44203;
}
@ -634,8 +627,8 @@ void OnAreaDraw(uiAreaHandler* handler, uiArea* area, uiAreaDrawParams* params)
{
if (!ScreenDrawInited)
{
ScreenBitmap = uiDrawNewBitmap(params->Context, 256, 384);
ScreenDrawInited = true;
ScreenBitmap = uiDrawNewBitmap(params->Context, 256, 384);
}
if (!ScreenBitmap) return;
@ -1981,6 +1974,7 @@ int main(int argc, char** argv)
areahandler.KeyEvent = OnAreaKeyEvent;
areahandler.Resize = OnAreaResize;
ScreenDrawInited = false;
MainDrawArea = uiNewArea(&areahandler);
uiWindowSetChild(MainWindow, uiControl(MainDrawArea));
uiControlSetMinSize(uiControl(MainDrawArea), 256, 384);
@ -2011,6 +2005,15 @@ int main(int argc, char** argv)
OnSetScreenRotation(MenuItem_ScreenRot[ScreenRotation], MainWindow, (void*)&kScreenRot[ScreenRotation]);
// TODO: fail gracefully, support older OpenGL, etc
GLContext = uiGLNewContext(uiControl(MainDrawArea), 4, 3); // haw haw haw
uiGLMakeContextCurrent(GLContext);
void* testor = uiGLGetProcAddress("glUseProgram");
void* testor2 = uiGLGetProcAddress("glBindFramebuffer");
printf("OPENGL: %p %p\n", testor, testor2);
uiGLMakeContextCurrent(NULL);
SDL_AudioSpec whatIwant, whatIget;
memset(&whatIwant, 0, sizeof(SDL_AudioSpec));
whatIwant.freq = 47340;
@ -2092,6 +2095,8 @@ int main(int argc, char** argv)
if (MicWavBuffer) delete[] MicWavBuffer;
uiGLFreeContext(GLContext);
Config::ScreenRotation = ScreenRotation;
Config::ScreenGap = ScreenGap;
Config::ScreenLayout = ScreenLayout;