Changeset 5271e4c in mainline

Timestamp:

2020-06-22T12:20:42Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

195b7b3

Parents:

66a408f7

git-author:

Jiri Svoboda <jiri@…> (2020-06-21 15:20:18)

git-committer:

Jiri Svoboda <jiri@…> (2020-06-22 12:20:42)

Message:

Duplicate rendering to additional output devices using a cloning GC

This gives the display server a pretty good illusion of rendering to just
one output device, while supporting multiple. This makes RFB work properly.

Location:

uspace

Files:

• lib/gfx/src/bitmap.c (modified) (1 diff)
• lib/memgfx/src/memgc.c (modified) (5 diffs)
• srv/hid/display/clonegc.c (added)
• srv/hid/display/clonegc.h (added)
• srv/hid/display/ddev.c (modified) (1 diff)
• srv/hid/display/display.c (modified) (3 diffs)
• srv/hid/display/meson.build (modified) (3 diffs)
• srv/hid/display/test/clonegc.c (added)
• srv/hid/display/test/main.c (modified) (1 diff)
• srv/hid/display/types/display/clonegc.h (added)
• srv/hid/display/types/display/display.h (modified) (2 diffs)
• srv/hid/rfb/main.c (modified) (1 diff)

uspace/lib/gfx/src/bitmap.c

@@ -77 +77 @@
 
         rc = gc->ops->bitmap_create(gc->arg, params, alloc, &bm_priv);
-        if (rc != EOK)
+        if (rc != EOK) {
+                free(bitmap);
                 return rc;
+        }
 
         bitmap->gc = gc;

uspace/lib/memgfx/src/memgc.c

@@ -70 +70 @@
  * Set drawing color on memory GC.
  *
- * @param arg Canvas GC
+ * @param arg Memory GC
  * @param color Color
  *
@@ -87 +87 @@
 /** Fill rectangle on memory GC.
  *
- * @param arg Canvas GC
+ * @param arg Memory GC
  * @param rect Rectangle
  *
@@ -166 +166 @@
 /** Delete memory GC.
  *
- * @param mgc Canvas GC
+ * @param mgc Memory GC
  */
 errno_t mem_gc_delete(mem_gc_t *mgc)
@@ -195 +195 @@
 /** Get generic graphic context from memory GC.
  *
- * @param mgc Canvas GC
+ * @param mgc Memory GC
  * @return Graphic context
  */
@@ -210 +210 @@
 /** Create bitmap in memory GC.
  *
- * @param arg Canvas GC
+ * @param arg Memory GC
  * @param params Bitmap params
  * @param alloc Bitmap allocation info or @c NULL

uspace/srv/hid/display/ddev.c

@@ -141 +141 @@
         }
 
-        rc = ds_display_paint_bg(display, NULL);
+        rc = ds_display_paint(display, NULL);
         if (rc != EOK)
                 return rc;

uspace/srv/hid/display/display.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include "client.h"
+#include "clonegc.h"
 #include "cursimg.h"
 #include "cursor.h"
@@ -505 +506 @@
                 disp->rect = ddev->info.rect;
 
+                /* Create cloning GC */
+                rc = ds_clonegc_create(ddev->gc, &disp->fbgc);
+                if (rc != EOK) {
+                        // XXX Remove output
+                        return ENOMEM;
+                }
+
                 /* Allocate backbuffer */
                 rc = ds_display_alloc_backbuf(disp);
+                if (rc != EOK) {
+                        // XXX Remove output
+                        // XXX Delete clone GC
+                        goto error;
+                }
+        } else {
+                /* Add new output device to cloning GC */
+                rc = ds_clonegc_add_output(disp->fbgc, ddev->gc);
                 if (rc != EOK)
                         goto error;
@@ -596 +612 @@
 static gfx_context_t *ds_display_get_unbuf_gc(ds_display_t *display)
 {
-        ds_ddev_t *ddev;
-
-        /*
-         * XXX To properly support multiple display devices, create
-         * a cloning GC that copies rendering operation to each output.
-         */
-        ddev = ds_display_first_ddev(display);
-        if (ddev == NULL)
-                return NULL;
-
-        return ddev->gc;
+        /* In case of unit tests */
+        if (display->fbgc == NULL)
+                return NULL;
+
+        return ds_clonegc_get_ctx(display->fbgc);
 }
 

uspace/srv/hid/display/meson.build

@@ -31 +31 @@
 src = files(
         'client.c',
+        'clonegc.c',
         'cursor.c',
         'cursimg.c',
@@ -45 +46 @@
 test_src = files(
         'client.c',
+        'clonegc.c',
         'cursimg.c',
         'cursor.c',
@@ -52 +54 @@
         'window.c',
         'test/client.c',
+        'test/clonegc.c',
         'test/cursor.c',
         'test/display.c',

uspace/srv/hid/display/test/main.c

@@ -32 +32 @@
 
 PCUT_IMPORT(client);
+PCUT_IMPORT(clonegc);
 PCUT_IMPORT(cursor);
 PCUT_IMPORT(display);

uspace/srv/hid/display/types/display/display.h

@@ -45 +45 @@
 #include <types/display/cursor.h>
 #include "cursor.h"
+#include "clonegc.h"
 #include "window.h"
 
@@ -100 +101 @@
         mem_gc_t *bbgc;
 
+        /** Frontbuffer (clone) GC */
+        ds_clonegc_t *fbgc;
+
         /** Backbuffer dirty rectangle */
         gfx_rect_t dirty_rect;

uspace/srv/hid/rfb/main.c

@@ -110 +110 @@
         rfb->damage_rect.y = new_rect.p0.y;
         rfb->damage_rect.width = new_rect.p1.x - new_rect.p0.x;
-        rfb->damage_rect.height = new_rect.p1.y - new_rect.p1.y;
+        rfb->damage_rect.height = new_rect.p1.y - new_rect.p0.y;
 }