From 08419c0c957bab607d9d8164293610f881bb7f02 Mon Sep 17 00:00:00 2001
From: Vincent Wei <vincent@minigui.org>
Date: Fri, 4 Jun 2021 21:21:26 +0800
Subject: [PATCH] tune fbcon code for compositing schema

---
 src/newgal/fbcon/fbvideo.c | 50 ++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/newgal/fbcon/fbvideo.c b/src/newgal/fbcon/fbvideo.c
index 13f792f6..e07c898a 100644
--- a/src/newgal/fbcon/fbvideo.c
+++ b/src/newgal/fbcon/fbvideo.c
@@ -62,9 +62,6 @@
 
 #include "common.h"
 #include "minigui.h"
-#ifdef _MGRM_PROCESSES
-#include "client.h"
-#endif
 #include "newgal.h"
 #include "sysvideo.h"
 #include "pixels_c.h"
@@ -73,6 +70,11 @@
 #include "fbmatrox.h"
 #include "fbneomagic.h"
 
+#ifdef _MGRM_PROCESSES
+#include "client.h"
+#include "sharedres.h"
+#endif
+
 // #define FBCON_DEBUG     1
 // #define FBACCEL_DEBUG   1
 
@@ -358,14 +360,14 @@ static int FB_VideoInit(_THIS, GAL_PixelFormat *vformat)
     int i;
     const char *GAL_fbdev;
 
-#if defined(__TARGET_R818__) && defined(_MGSCHEMA_COMPOSITING)
+#ifdef _MGSCHEMA_COMPOSITING
     if (!mgIsServer) {
-        vformat->Amask = 0xFF000000;
-        vformat->Rmask = 0x00FF0000;
-        vformat->Gmask = 0x0000FF00;
-        vformat->Bmask = 0x000000FF;
-        vformat->BitsPerPixel = 32;
-        vformat->BytesPerPixel = 4;
+        vformat->Amask = SHAREDRES_VIDEO_AMASK;
+        vformat->Rmask = SHAREDRES_VIDEO_RMASK;
+        vformat->Gmask = SHAREDRES_VIDEO_GMASK;
+        vformat->Bmask = SHAREDRES_VIDEO_BMASK;
+        vformat->BitsPerPixel = SHAREDRES_VIDEO_DEPTH;
+        vformat->BytesPerPixel = (SHAREDRES_VIDEO_DEPTH + 7) >> 3;
         return 0;
     }
 #endif
@@ -1029,18 +1031,20 @@ static void FB_RequestHWSurface (_THIS, const REQ_HWSURFACE* request,
 
 static int FB_AllocHWSurface (_THIS, GAL_Surface *surface)
 {
-#if defined(__TARGET_R818__) && defined(_MGSCHEMA_COMPOSITING)
-    return -1;
-#else
     REQ_HWSURFACE request = {surface->w, surface->h, surface->pitch, 0, NULL};
     REP_HWSURFACE reply = {0, 0, NULL};
 
 #ifdef _MGRM_PROCESSES
-    if (mgIsServer)
+    if (mgIsServer) {
         FB_RequestHWSurface (this, &request, &reply);
+    }
     else {
         REQUEST req;
 
+#ifdef _MGSCHEMA_COMPOSITING
+    if (!mgIsServer)
+        return -1;
+#endif
         req.id = REQID_HWSURFACE;
         req.data = &request;
         req.len_data = sizeof (REQ_HWSURFACE);
@@ -1060,16 +1064,10 @@ static int FB_AllocHWSurface (_THIS, GAL_Surface *surface)
     surface->hwdata = (struct private_hwdata *)reply.bucket;
 
     return 0;
-#endif
 }
 
 static void FB_FreeHWSurface(_THIS, GAL_Surface *surface)
 {
-#if defined(__TARGET_R818__) && defined(_MGSCHEMA_COMPOSITING)
-    surface->pixels = NULL;
-    surface->hwdata = NULL;
-    return;
-#else
     REQ_HWSURFACE request = {surface->w, surface->h, surface->pitch, 0,
         surface->hwdata};
     REP_HWSURFACE reply = {0, 0};
@@ -1077,11 +1075,18 @@ static void FB_FreeHWSurface(_THIS, GAL_Surface *surface)
     request.offset = (char*)surface->pixels - (char*)mapped_mem;
 
 #ifdef _MGRM_PROCESSES
-    if (mgIsServer)
+    if (mgIsServer) {
         FB_RequestHWSurface (this, &request, &reply);
+    }
     else {
         REQUEST req;
 
+#ifdef _MGSCHEMA_COMPOSITING
+        surface->pixels = NULL;
+        surface->hwdata = NULL;
+        return;
+#endif
+
         if (surface->hwdata == NULL) {
             surface->pixels = NULL;
             return;
@@ -1101,7 +1106,6 @@ static void FB_FreeHWSurface(_THIS, GAL_Surface *surface)
 
     surface->pixels = NULL;
     surface->hwdata = NULL;
-#endif
 }
 
 static void FB_WaitVBL(_THIS)
@@ -1264,7 +1268,7 @@ static int FB_SetColors(_THIS, int firstcolor, int ncolors, GAL_Color *colors)
 */
 static void FB_VideoQuit(_THIS)
 {
-#if defined(__TARGET_R818__) && defined(_MGSCHEMA_COMPOSITING)
+#ifdef _MGSCHEMA_COMPOSITING
     if (!mgIsServer) {
         return;
     }