VI service: major revamp, see details:

- Added viOpenDefaultDisplay.
- Replaced viOpenLayer with viCreateLayer.
- NativeWindow parcel data is now parsed by viCreateLayer, and the
  ViLayer struct contains a new igbp_binder_obj_id field.
- LayerFlags/LayerId parameters replaced by weak global variables
  __nx_vi_layer_id/__nx_vi_stray_layer_flags.
- The root vi:* session is closed on startup.
- Simplified corresponding gfx code.
- Misc style fixes

Author: fincs

nx/include/switch/services/vi.h

@@ -16,8 +16,9 @@ typedef struct {
 
 typedef struct {
     u64  layer_id;
-    bool stray_layer;
-    bool initialized;
+    u32  igbp_binder_obj_id;
+    bool initialized : 1;
+    bool stray_layer : 1;
 } ViLayer;
 
 typedef enum {
@@ -27,7 +28,7 @@ typedef enum {
     ViServiceType_Manager = 2,
 } ViServiceType;
 
-/// Used by viOpenLayer when CreateStrayLayer is used internally.
+/// Used by viCreateLayer when CreateStrayLayer is used internally.
 typedef enum {
     ViLayerFlags_Default = 0x1,
 } ViLayerFlags;
@@ -37,24 +38,32 @@ typedef enum {
     ViScalingMode_Default = 0x2,
 } ViScalingMode;
 
-Result viInitialize(ViServiceType servicetype);
+Result viInitialize(ViServiceType service_type);
 void viExit(void);
 
-Service* viGetSessionService(void);
 Service* viGetSession_IApplicationDisplayService(void);
 Service* viGetSession_IHOSBinderDriverRelay(void);
 Service* viGetSession_ISystemDisplayService(void);
 Service* viGetSession_IManagerDisplayService(void);
 Service* viGetSession_IHOSBinderDriverIndirect(void);
 
-Result viOpenDisplay(const char *DisplayName, ViDisplay *display);
+// Display functions
+
+Result viOpenDisplay(const char *display_name, 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);
 
-/// See ViScalingMode.
-Result viSetLayerScalingMode(ViLayer *layer, u32 ScalingMode);
+static inline Result viOpenDefaultDisplay(ViDisplay *display)
+{
+    return viOpenDisplay("Default", display);
+}
 
 Result viGetDisplayResolution(ViDisplay *display, u64 *width, u64 *height);
 Result viGetDisplayVsyncEvent(ViDisplay *display, Handle *handle_out);
+
+// Layer functions
+
+Result viCreateLayer(const ViDisplay *display, ViLayer *layer);
+Result viCreateManagedLayer(const ViDisplay *display, ViLayerFlags layer_flags, u64 aruid, u64 *layer_id);
+Result viCloseLayer(ViLayer *layer);
+
+Result viSetLayerScalingMode(ViLayer *layer, ViScalingMode scaling_mode);

nx/source/display/gfx.c

@@ -16,9 +16,6 @@ static bool g_gfxInitialized = 0;
 static ViDisplay g_gfxDisplay;
 static Handle g_gfxDisplayVsyncEvent = INVALID_HANDLE;
 static ViLayer g_gfxLayer;
-static u8 g_gfxNativeWindow[0x100];
-static u64 g_gfxNativeWindow_Size;
-static s32 g_gfxNativeWindow_ID;
 static Binder g_gfxBinderSession;
 static s32 g_gfxCurrentBuffer = 0;
 static s32 g_gfxCurrentProducerBuffer = 0;
@@ -111,20 +108,6 @@ static BqGraphicBuffer g_gfx_BufferInitData = {
     }
 };
 
-static Result _gfxGetNativeWindowID(u8 *buf, u64 size, s32 *out_ID) {
-    u32 *bufptr = (u32*)buf;
-
-    //Validate ParcelData{Size|Offset}.
-    if((u64)bufptr[1] > size || (u64)bufptr[0] > size || ((u64)bufptr[1])+((u64)bufptr[0]) > size) return MAKERESULT(Module_Libnx, LibnxError_BadInput);
-    if(bufptr[0] < 0xc) return MAKERESULT(Module_Libnx, LibnxError_BadInput);
-    //bufptr = start of ParcelData
-    bufptr = (u32*)&buf[bufptr[1]];
-
-    *out_ID = (s32)bufptr[2];
-
-    return 0;
-}
-
 static Result _gfxDequeueBuffer(void) {
     Result rc=0;
     BqFence *fence = &g_gfx_DequeueBuffer_fence;
@@ -166,13 +149,12 @@ static Result _gfxQueueBuffer(s32 buf) {
     return rc;
 }
 
-static Result _gfxInit(ViServiceType servicetype, const char *DisplayName, u32 LayerFlags, u64 LayerId) {
+Result gfxInitDefault(void) {
     Result rc=0;
     u32 i=0;
 
     if(g_gfxInitialized)return 0;
 
-    g_gfxNativeWindow_ID = 0;
     g_gfxDisplayVsyncEvent = INVALID_HANDLE;
     g_gfxCurrentBuffer = -1;
     g_gfxCurrentProducerBuffer = -1;
@@ -224,20 +206,18 @@ static Result _gfxInit(ViServiceType servicetype, const char *DisplayName, u32 L
         return rc;
     }
 
-    rc = viInitialize(servicetype);
+    rc = viInitialize(ViServiceType_Default);
 
-    if (R_SUCCEEDED(rc)) rc = viOpenDisplay(DisplayName, &g_gfxDisplay);
+    if (R_SUCCEEDED(rc)) rc = viOpenDefaultDisplay(&g_gfxDisplay);
 
     if (R_SUCCEEDED(rc)) rc = viGetDisplayVsyncEvent(&g_gfxDisplay, &g_gfxDisplayVsyncEvent);
 
-    if (R_SUCCEEDED(rc)) rc = viOpenLayer(g_gfxNativeWindow, &g_gfxNativeWindow_Size, &g_gfxDisplay, &g_gfxLayer, LayerFlags, LayerId);
+    if (R_SUCCEEDED(rc)) rc = viCreateLayer(&g_gfxDisplay, &g_gfxLayer);
 
     if (R_SUCCEEDED(rc)) rc = viSetLayerScalingMode(&g_gfxLayer, ViScalingMode_Default);
 
-    if (R_SUCCEEDED(rc)) rc = _gfxGetNativeWindowID(g_gfxNativeWindow, g_gfxNativeWindow_Size, &g_gfxNativeWindow_ID);
-
     if (R_SUCCEEDED(rc)) {
-        binderCreate(&g_gfxBinderSession, viGetSession_IHOSBinderDriverRelay()->handle, g_gfxNativeWindow_ID);
+        binderCreate(&g_gfxBinderSession, viGetSession_IHOSBinderDriverRelay()->handle, g_gfxLayer.igbp_binder_obj_id);
         rc = binderInitSession(&g_gfxBinderSession, 0x0f);
     }
 
@@ -308,7 +288,6 @@ static Result _gfxInit(ViServiceType servicetype, const char *DisplayName, u32 L
         free(g_gfxFramebufLinear);
         g_gfxFramebufLinear = NULL;
 
-        g_gfxNativeWindow_ID = 0;
         g_gfxCurrentBuffer = 0;
         g_gfxCurrentProducerBuffer = -1;
         g_gfx_ProducerConnected = 0;
@@ -327,10 +306,6 @@ static Result _gfxInit(ViServiceType servicetype, const char *DisplayName, u32 L
     return rc;
 }
 
-Result gfxInitDefault(void) {
-    return _gfxInit(ViServiceType_Default, "Default", ViLayerFlags_Default, 0);
-}
-
 void gfxExit(void)
 {
     u32 i = 0;
@@ -365,7 +340,6 @@ void gfxExit(void)
     g_gfxFramebufLinear = NULL;
 
     g_gfxInitialized = 0;
-    g_gfxNativeWindow_ID = 0;
 
     g_gfxCurrentBuffer = 0;
     g_gfxCurrentProducerBuffer = -1;