Changeset afcf704 in mainline for uspace/lib/ipcgfx/src

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/src

Files:

• client.c (modified) (3 diffs)
• server.c (modified) (3 diffs)

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);