Changeset 2ab8ab3 in mainline for uspace/lib/ipcgfx

Timestamp:

2021-02-16T18:12:05Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68a552f

Parents:

ef734b7

Message:

Client-side UI rendering

It is possible to turn on and off and if turned on, one can also
enable or disable window double buffering (currently both options
are build-time).

Location:

uspace/lib/ipcgfx

Files:

• include/ipcgfx/ipc/gc.h (modified) (2 diffs)
• src/client.c (modified) (4 diffs)
• src/server.c (modified) (3 diffs)
• test/ipcgfx.c (modified) (6 diffs)

uspace/lib/ipcgfx/include/ipcgfx/ipc/gc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
         GC_SET_RGB_COLOR = IPC_FIRST_USER_METHOD,
         GC_FILL_RECT,
+        GC_UPDATE,
         GC_BITMAP_CREATE,
         GC_BITMAP_CREATE_DOUTPUT,
         GC_BITMAP_DESTROY,
         GC_BITMAP_RENDER,
-        GC_BITMAP_GET_ALLOC
+        GC_BITMAP_GET_ALLOC,
 } gc_request_t;
 

uspace/lib/ipcgfx/src/client.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -47 +47 @@
 static errno_t ipc_gc_set_color(void *, gfx_color_t *);
 static errno_t ipc_gc_fill_rect(void *, gfx_rect_t *);
+static errno_t ipc_gc_update(void *);
 static errno_t ipc_gc_bitmap_create(void *, gfx_bitmap_params_t *,
     gfx_bitmap_alloc_t *, void **);
@@ -56 +57 @@
         .set_color = ipc_gc_set_color,
         .fill_rect = ipc_gc_fill_rect,
+        .update = ipc_gc_update,
         .bitmap_create = ipc_gc_bitmap_create,
         .bitmap_destroy = ipc_gc_bitmap_destroy,
@@ -103 +105 @@
         rc = async_req_4_0(exch, GC_FILL_RECT, rect->p0.x, rect->p0.y,
             rect->p1.x, rect->p1.y);
+        async_exchange_end(exch);
+
+        return rc;
+}
+
+/** Update display on IPC GC.
+ *
+ * @param arg IPC GC
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t ipc_gc_update(void *arg)
+{
+        ipc_gc_t *ipcgc = (ipc_gc_t *) arg;
+        async_exch_t *exch;
+        errno_t rc;
+
+        exch = async_exchange_begin(ipcgc->sess);
+        rc = async_req_0_0(exch, GC_UPDATE);
         async_exchange_end(exch);
 

uspace/lib/ipcgfx/src/server.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -86 +86 @@
 }
 
+static void gc_update_srv(ipc_gc_srv_t *srvgc, ipc_call_t *call)
+{
+        errno_t rc;
+
+        rc = gfx_update(srvgc->gc);
+        async_answer_0(call, rc);
+}
+
 static void gc_bitmap_create_srv(ipc_gc_srv_t *srvgc, ipc_call_t *icall)
 {
@@ -358 +366 @@
                 case GC_FILL_RECT:
                         gc_fill_rect_srv(&srvgc, &call);
+                        break;
+                case GC_UPDATE:
+                        gc_update_srv(&srvgc, &call);
                         break;
                 case GC_BITMAP_CREATE:

uspace/lib/ipcgfx/test/ipcgfx.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -52 +52 @@
 static errno_t test_gc_set_color(void *, gfx_color_t *);
 static errno_t test_gc_fill_rect(void *, gfx_rect_t *);
+static errno_t test_gc_update(void *);
 static errno_t test_gc_bitmap_create(void *, gfx_bitmap_params_t *,
     gfx_bitmap_alloc_t *, void **);
@@ -61 +62 @@
         .set_color = test_gc_set_color,
         .fill_rect = test_gc_fill_rect,
+        .update = test_gc_update,
         .bitmap_create = test_gc_bitmap_create,
         .bitmap_destroy = test_gc_bitmap_destroy,
@@ -80 +82 @@
         bool fill_rect_called;
         gfx_rect_t fill_rect_rect;
+
+        bool update_called;
 
         bool bitmap_create_called;
@@ -292 +296 @@
         PCUT_ASSERT_EQUALS(rect.p1.x, resp.fill_rect_rect.p1.x);
         PCUT_ASSERT_EQUALS(rect.p1.y, resp.fill_rect_rect.p1.y);
+
+        ipc_gc_delete(ipcgc);
+        async_hangup(sess);
+
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** gfx_update with server returning failure */
+PCUT_TEST(update_failure)
+{
+        errno_t rc;
+        service_id_t sid;
+        test_response_t resp;
+        gfx_context_t *gc;
+        async_sess_t *sess;
+        ipc_gc_t *ipcgc;
+
+        async_set_fallback_port_handler(test_ipcgc_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_ipcgfx_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_ipcgfx_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        sess = loc_service_connect(sid, INTERFACE_GC, 0);
+        PCUT_ASSERT_NOT_NULL(sess);
+
+        rc = ipc_gc_create(sess, &ipcgc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gc = ipc_gc_get_ctx(ipcgc);
+        PCUT_ASSERT_NOT_NULL(gc);
+
+        resp.rc = ENOMEM;
+        resp.update_called = false;
+        rc = gfx_update(gc);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+        PCUT_ASSERT_TRUE(resp.update_called);
+
+        ipc_gc_delete(ipcgc);
+        async_hangup(sess);
+
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** gfx_update with server returning success */
+PCUT_TEST(update_success)
+{
+        errno_t rc;
+        service_id_t sid;
+        test_response_t resp;
+        gfx_context_t *gc;
+        async_sess_t *sess;
+        ipc_gc_t *ipcgc;
+
+        async_set_fallback_port_handler(test_ipcgc_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_ipcgfx_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_ipcgfx_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        sess = loc_service_connect(sid, INTERFACE_GC, 0);
+        PCUT_ASSERT_NOT_NULL(sess);
+
+        rc = ipc_gc_create(sess, &ipcgc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gc = ipc_gc_get_ctx(ipcgc);
+        PCUT_ASSERT_NOT_NULL(gc);
+
+        resp.rc = EOK;
+        resp.update_called = false;
+        rc = gfx_update(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(resp.update_called);
 
         ipc_gc_delete(ipcgc);
@@ -847 +933 @@
 }
 
+/** Update test GC.
+ *
+ * @param arg Test GC
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t test_gc_update(void *arg)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->update_called = true;
+        return resp->rc;
+}
+
 /** Create bitmap in test GC.
  *