From 83ec6062af5434d1f0fc5bf9eca9a5403f4e003f Mon Sep 17 00:00:00 2001
From: Pierre Wendling <[EMAIL REDACTED]>
Date: Sun, 18 Sep 2022 13:46:09 -0400
Subject: [PATCH] N3DS: Move gfxInit and hidInit from main to video.
---
src/main/n3ds/SDL_n3ds_main.c | 4 ----
src/video/n3ds/SDL_n3dsvideo.c | 7 ++++++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/n3ds/SDL_n3ds_main.c b/src/main/n3ds/SDL_n3ds_main.c
index 244d73c39fb0..1ccd014803f3 100644
--- a/src/main/n3ds/SDL_n3ds_main.c
+++ b/src/main/n3ds/SDL_n3ds_main.c
@@ -49,15 +49,11 @@ N3DS_Init(void)
{
osSetSpeedupEnable(true);
romfsInit();
- gfxInit(GSP_RGBA8_OES, GSP_RGBA8_OES, false);
- hidInit();
}
SDL_FORCE_INLINE void
N3DS_Quit(void)
{
- hidExit();
- gfxExit();
romfsExit();
}
diff --git a/src/video/n3ds/SDL_n3dsvideo.c b/src/video/n3ds/SDL_n3dsvideo.c
index cd5e01068c57..e3f79cb63999 100644
--- a/src/video/n3ds/SDL_n3dsvideo.c
+++ b/src/video/n3ds/SDL_n3dsvideo.c
@@ -95,6 +95,9 @@ VideoBootStrap N3DS_bootstrap = { N3DSVID_DRIVER_NAME, "N3DS Video Driver", N3DS
static int
N3DS_VideoInit(_THIS)
{
+ gfxInit(GSP_RGBA8_OES, GSP_RGBA8_OES, false);
+ hidInit();
+
AddN3DSDisplay(GFX_TOP);
AddN3DSDisplay(GFX_BOTTOM);
@@ -139,7 +142,9 @@ N3DS_VideoQuit(_THIS)
{
N3DS_SwkbQuit();
N3DS_QuitTouch();
- return;
+
+ hidExit();
+ gfxExit();
}
static void