From e5726cbc834a30b190421beabd3dd08d45801519 Mon Sep 17 00:00:00 2001 From: shinyquagsire23 Date: Thu, 11 Jan 2018 19:11:39 -0700 Subject: [PATCH] Move viCreateManagedLayer logic out of viOpenLayer --- nx/include/switch/services/vi.h | 1 + nx/source/services/vi.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nx/include/switch/services/vi.h b/nx/include/switch/services/vi.h index 59c1ce8d..1ebb688d 100644 --- a/nx/include/switch/services/vi.h +++ b/nx/include/switch/services/vi.h @@ -38,6 +38,7 @@ Handle viGetSession_IHOSBinderDriverIndirect(void); Result viOpenDisplay(const char *DisplayName, ViDisplay *display); Result viCloseDisplay(ViDisplay *display); +Result viCreateManagedLayer(const ViDisplay *display, u32 LayerFlags, u64 AppletResourceUserId, u64 *layer_id); Result viOpenLayer(u8 NativeWindow[0x100], u64 *NativeWindow_Size, const ViDisplay *display, ViLayer *layer, u32 LayerFlags, u64 LayerId); Result viCloseLayer(ViLayer *layer); diff --git a/nx/source/services/vi.c b/nx/source/services/vi.c index 4dd23439..17b00827 100644 --- a/nx/source/services/vi.c +++ b/nx/source/services/vi.c @@ -249,7 +249,7 @@ Result viCloseDisplay(ViDisplay *display) { return rc; } -static Result _viCreateManagedLayer(const ViDisplay *display, u32 LayerFlags, u64 AppletResourceUserId, u64 *layer_id) { +Result viCreateManagedLayer(const ViDisplay *display, u32 LayerFlags, u64 AppletResourceUserId, u64 *layer_id) { IpcCommand c; ipcInitialize(&c); @@ -396,8 +396,7 @@ Result viOpenLayer(u8 NativeWindow[0x100], u64 *NativeWindow_Size, const ViDispl } else { if (layer_id==0) { - rc = _viCreateManagedLayer(display, LayerFlags, AppletResourceUserId, &layer_id); - if (R_FAILED(rc)) rc = appletCreateManagedDisplayLayer(&layer_id); + rc = appletCreateManagedDisplayLayer(&layer_id); if (R_FAILED(rc)) return rc; }