Move viCreateManagedLayer logic out of viOpenLayer

This commit is contained in:
shinyquagsire23 2018-01-11 19:11:39 -07:00
parent 3fcd8a1596
commit e5726cbc83
2 changed files with 3 additions and 3 deletions

View File

@ -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);

View File

@ -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;
}