Changeset afcf704 in mainline for uspace/lib/ipcgfx

Timestamp:

2020-06-14T22:23:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c45d8696

Parents:

28f8f6f2

Message:

Allow GUI direct access to window buffer

Location:

uspace/lib/ipcgfx

Files:

• include/ipcgfx/ipc/gc.h (modified) (1 diff)
• src/client.c (modified) (3 diffs)
• src/server.c (modified) (3 diffs)
• test/ipcgfx.c (modified) (7 diffs)

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

@@ -42 +42 @@
         GC_FILL_RECT,
         GC_BITMAP_CREATE,
+        GC_BITMAP_CREATE_DOUTPUT,
         GC_BITMAP_DESTROY,
         GC_BITMAP_RENDER,

uspace/lib/ipcgfx/src/client.c

@@ -108 +108 @@
 }
 
-/** Create bitmap in IPC GC.
+/** Create normal bitmap in IPC GC.
  *
  * @param arg IPC GC
@@ -116 +116 @@
  * @return EOK on success or an error code
  */
-errno_t ipc_gc_bitmap_create(void *arg, gfx_bitmap_params_t *params,
+static errno_t ipc_gc_bitmap_create_normal(void *arg,
+    gfx_bitmap_params_t *params,
     gfx_bitmap_alloc_t *alloc, void **rbm)
 {
@@ -209 +210 @@
 }
 
+/** Create direct output bitmap in IPC GC.
+ *
+ * @param arg IPC GC
+ * @param params Bitmap params
+ * @param alloc Bitmap allocation info or @c NULL
+ * @param rbm Place to store pointer to new bitmap
+ * @return EOK on success or an error code
+ */
+static errno_t ipc_gc_bitmap_create_direct_output(void *arg,
+    gfx_bitmap_params_t *params,
+    gfx_bitmap_alloc_t *alloc, void **rbm)
+{
+        ipc_gc_t *ipcgc = (ipc_gc_t *) arg;
+        ipc_gc_bitmap_t *ipcbm = NULL;
+        gfx_coord2_t dim;
+        async_exch_t *exch = NULL;
+        void *pixels;
+        ipc_call_t answer;
+        size_t asize;
+        aid_t req;
+        errno_t rc;
+
+        /* Cannot specify allocation for direct output bitmap */
+        if (alloc != NULL)
+                return EINVAL;
+
+        ipcbm = calloc(1, sizeof(ipc_gc_bitmap_t));
+        if (ipcbm == NULL)
+                return ENOMEM;
+
+        gfx_coord2_subtract(&params->rect.p1, &params->rect.p0, &dim);
+        ipcbm->rect = params->rect;
+
+        ipcbm->alloc.pitch = dim.x * sizeof(uint32_t);
+        ipcbm->alloc.off0 = 0;
+        ipcbm->myalloc = true;
+
+        asize = PAGES2SIZE(SIZE2PAGES(ipcbm->alloc.pitch * dim.y));
+
+        exch = async_exchange_begin(ipcgc->sess);
+        req = async_send_0(exch, GC_BITMAP_CREATE_DOUTPUT, &answer);
+        rc = async_data_write_start(exch, params, sizeof (gfx_bitmap_params_t));
+        if (rc != EOK) {
+                async_forget(req);
+                goto error;
+        }
+
+        rc = async_share_in_start_0_0(exch, asize, &pixels);
+        if (rc != EOK) {
+                async_forget(req);
+                goto error;
+        }
+        async_exchange_end(exch);
+        exch = NULL;
+
+        async_wait_for(req, &rc);
+        if (rc != EOK)
+                goto error;
+
+        ipcbm->ipcgc = ipcgc;
+        ipcbm->bmp_id = ipc_get_arg1(&answer);
+        ipcbm->alloc.pixels = pixels;
+        *rbm = (void *)ipcbm;
+        return EOK;
+error:
+        if (exch != NULL)
+                async_exchange_end(exch);
+        if (ipcbm != NULL) {
+                if (ipcbm->alloc.pixels != NULL)
+                        as_area_destroy(ipcbm->alloc.pixels);
+                free(ipcbm);
+        }
+        return rc;
+}
+
+/** Create bitmap in IPC GC.
+ *
+ * @param arg IPC GC
+ * @param params Bitmap params
+ * @param alloc Bitmap allocation info or @c NULL
+ * @param rbm Place to store pointer to new bitmap
+ * @return EOK on success or an error code
+ */
+errno_t ipc_gc_bitmap_create(void *arg, gfx_bitmap_params_t *params,
+    gfx_bitmap_alloc_t *alloc, void **rbm)
+{
+        if ((params->flags & bmpf_direct_output) != 0) {
+                return ipc_gc_bitmap_create_direct_output(arg, params, alloc,
+                    rbm);
+        } else {
+                return ipc_gc_bitmap_create_normal(arg, params, alloc, rbm);
+        }
+}
+
 /** Destroy bitmap in IPC GC.
  *

uspace/lib/ipcgfx/src/server.c

@@ -128 +128 @@
         /* Check size */
         if (size != PAGES2SIZE(SIZE2PAGES(dim.x * dim.y * sizeof(uint32_t)))) {
-                printf("size=%zu, expected=%zu\n", size, dim.x * dim.y * sizeof(uint32_t));
                 async_answer_0(icall, EINVAL);
                 return;
@@ -168 +167 @@
 }
 
+static void gc_bitmap_create_doutput_srv(ipc_gc_srv_t *srvgc, ipc_call_t *icall)
+{
+        gfx_bitmap_params_t params;
+        gfx_bitmap_alloc_t alloc;
+        gfx_bitmap_t *bitmap;
+        gfx_coord2_t dim;
+        ipc_gc_srv_bitmap_t *srvbmp = NULL;
+        ipc_call_t call;
+        size_t size;
+        errno_t rc;
+
+        if (!async_data_write_receive(&call, &size)) {
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(gfx_bitmap_params_t)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(&call, &params, size);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        /* Bitmap dimensions */
+        gfx_coord2_subtract(&params.rect.p1, &params.rect.p0, &dim);
+
+        if (!async_share_in_receive(&call, &size)) {
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        /* Check size */
+        if (size != PAGES2SIZE(SIZE2PAGES(dim.x * dim.y * sizeof(uint32_t)))) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = gfx_bitmap_create(srvgc->gc, &params, NULL, &bitmap);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        rc = gfx_bitmap_get_alloc(bitmap, &alloc);
+        if (rc != EOK) {
+                gfx_bitmap_destroy(bitmap);
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        rc = async_share_in_finalize(&call, alloc.pixels, AS_AREA_READ |
+            AS_AREA_WRITE | AS_AREA_CACHEABLE);
+        if (rc != EOK) {
+                gfx_bitmap_destroy(bitmap);
+                async_answer_0(icall, EIO);
+                return;
+        }
+
+        srvbmp = calloc(1, sizeof(ipc_gc_srv_bitmap_t));
+        if (srvbmp == NULL) {
+                gfx_bitmap_destroy(bitmap);
+                async_answer_0(icall, ENOMEM);
+                return;
+        }
+
+        srvbmp->srvgc = srvgc;
+        list_append(&srvbmp->lbitmaps, &srvgc->bitmaps);
+        srvbmp->bmp = bitmap;
+        srvbmp->bmp_id = srvgc->next_bmp_id++;
+        printf("gc_bitmap_create_doutput_srv: storing bmp_id=%u\n",
+            (unsigned) srvbmp->bmp_id);
+
+        async_answer_1(icall, EOK, srvbmp->bmp_id);
+}
+
 static void gc_bitmap_destroy_srv(ipc_gc_srv_t *srvgc, ipc_call_t *call)
 {
@@ -270 +354 @@
                         gc_bitmap_create_srv(&srvgc, &call);
                         break;
+                case GC_BITMAP_CREATE_DOUTPUT:
+                        gc_bitmap_create_doutput_srv(&srvgc, &call);
+                        break;
                 case GC_BITMAP_DESTROY:
                         gc_bitmap_destroy_srv(&srvgc, &call);

uspace/lib/ipcgfx/test/ipcgfx.c

@@ -27 +27 @@
  */
 
+#include <as.h>
 #include <async.h>
 #include <errno.h>
@@ -96 +97 @@
 typedef struct {
         test_response_t *resp;
+        gfx_bitmap_alloc_t alloc;
 } test_bitmap_t;
 
@@ -474 +476 @@
 }
 
+/** gfx_bitmap_create direct output bitmap with server returning failure */
+PCUT_TEST(bitmap_create_dout_failure)
+{
+        errno_t rc;
+        service_id_t sid;
+        test_response_t resp;
+        gfx_context_t *gc;
+        gfx_bitmap_params_t params;
+        gfx_bitmap_t *bitmap;
+        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.bitmap_create_called = false;
+
+        gfx_bitmap_params_init(&params);
+        params.flags = bmpf_direct_output;
+        params.rect.p0.x = 1;
+        params.rect.p0.y = 2;
+        params.rect.p1.x = 3;
+        params.rect.p1.y = 4;
+        bitmap = NULL;
+        rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+        PCUT_ASSERT_TRUE(resp.bitmap_create_called);
+        PCUT_ASSERT_EQUALS(params.rect.p0.x, resp.bitmap_create_params.rect.p0.x);
+        PCUT_ASSERT_EQUALS(params.rect.p0.y, resp.bitmap_create_params.rect.p0.y);
+        PCUT_ASSERT_EQUALS(params.rect.p1.x, resp.bitmap_create_params.rect.p1.x);
+        PCUT_ASSERT_EQUALS(params.rect.p1.y, resp.bitmap_create_params.rect.p1.y);
+        PCUT_ASSERT_EQUALS((params.rect.p1.x - params.rect.p0.x) *
+            sizeof(uint32_t), (unsigned) resp.bitmap_create_alloc.pitch);
+        PCUT_ASSERT_EQUALS(0, resp.bitmap_create_alloc.off0);
+        PCUT_ASSERT_NOT_NULL(resp.bitmap_create_alloc.pixels);
+        PCUT_ASSERT_NULL(bitmap);
+
+        ipc_gc_delete(ipcgc);
+        async_hangup(sess);
+
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** gfx_bitmap_create direct output bitmap with server returning success */
+PCUT_TEST(bitmap_create_dout_success)
+{
+        errno_t rc;
+        service_id_t sid;
+        test_response_t resp;
+        gfx_context_t *gc;
+        gfx_bitmap_params_t params;
+        gfx_bitmap_t *bitmap;
+        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.bitmap_create_called = false;
+
+        gfx_bitmap_params_init(&params);
+        params.flags = bmpf_direct_output;
+        params.rect.p0.x = 1;
+        params.rect.p0.y = 2;
+        params.rect.p1.x = 3;
+        params.rect.p1.y = 4;
+        bitmap = NULL;
+        rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(resp.bitmap_create_called);
+        PCUT_ASSERT_EQUALS(params.rect.p0.x, resp.bitmap_create_params.rect.p0.x);
+        PCUT_ASSERT_EQUALS(params.rect.p0.y, resp.bitmap_create_params.rect.p0.y);
+        PCUT_ASSERT_EQUALS(params.rect.p1.x, resp.bitmap_create_params.rect.p1.x);
+        PCUT_ASSERT_EQUALS(params.rect.p1.y, resp.bitmap_create_params.rect.p1.y);
+        PCUT_ASSERT_EQUALS((params.rect.p1.x - params.rect.p0.x) *
+            sizeof(uint32_t), (unsigned) resp.bitmap_create_alloc.pitch);
+        PCUT_ASSERT_EQUALS(0, resp.bitmap_create_alloc.off0);
+        PCUT_ASSERT_NOT_NULL(resp.bitmap_create_alloc.pixels);
+        PCUT_ASSERT_NOT_NULL(bitmap);
+
+        resp.bitmap_destroy_called = false;
+        rc = gfx_bitmap_destroy(bitmap);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(resp.bitmap_destroy_called);
+
+        ipc_gc_delete(ipcgc);
+        async_hangup(sess);
+
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** gfx_bitmap_render with server returning failure */
 PCUT_TEST(bitmap_render_failure)
@@ -733 +860 @@
         test_response_t *resp = (test_response_t *) arg;
         test_bitmap_t *bitmap;
+        gfx_coord2_t dim;
 
         resp->bitmap_create_called = true;
         resp->bitmap_create_params = *params;
-        resp->bitmap_create_alloc = *alloc;
+
+        if ((params->flags & bmpf_direct_output) != 0) {
+                gfx_coord2_subtract(&params->rect.p1, &params->rect.p0, &dim);
+
+                resp->bitmap_create_alloc.pitch = dim.x * sizeof(uint32_t);
+                resp->bitmap_create_alloc.off0 = 0;
+                resp->bitmap_create_alloc.pixels = as_area_create(AS_AREA_ANY,
+                    dim.x * dim.y * sizeof(uint32_t), AS_AREA_READ |
+                    AS_AREA_WRITE | AS_AREA_CACHEABLE, AS_AREA_UNPAGED);
+                if (resp->bitmap_create_alloc.pixels == AS_MAP_FAILED)
+                        return ENOMEM;
+        } else {
+                resp->bitmap_create_alloc = *alloc;
+        }
 
         if (resp->rc != EOK)
@@ -746 +887 @@
 
         bitmap->resp = resp;
+        bitmap->alloc = resp->bitmap_create_alloc;
         *rbm = (void *) bitmap;
         return EOK;
@@ -763 +905 @@
         if (resp->rc != EOK)
                 return resp->rc;
+
+        if ((resp->bitmap_create_params.flags & bmpf_direct_output) != 0)
+                as_area_destroy(resp->bitmap_create_alloc.pixels);
 
         free(bitmap);
@@ -795 +940 @@
 static errno_t test_gc_bitmap_get_alloc(void *bm, gfx_bitmap_alloc_t *alloc)
 {
-        /* Currently IPC GC does not pass this method to the server */
-        return ENOTSUP;
+        test_bitmap_t *bitmap = (test_bitmap_t *) bm;
+
+        *alloc = bitmap->alloc;
+        return EOK;
 }