Changeset 71cbe5c in mainline

Timestamp:

2019-12-06T17:48:48Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0b63dc2

Parents:

87a7cdb

Message:

Make bitmaps work with IPC GC / RFB

Location:

uspace

Files:

• lib/ipcgfx/src/client.c (modified) (2 diffs)
• srv/hid/rfb/main.c (modified) (2 diffs)

uspace/lib/ipcgfx/src/client.c

@@ -123 +123 @@
         gfx_coord2_t dim;
         async_exch_t *exch = NULL;
+        as_area_info_t info;
         ipc_call_t answer;
+        size_t asize;
         aid_t req;
         errno_t rc;
@@ -148 +150 @@
         } else {
                 /*
-                 * XXX We could allow this if the pixels point to a shareable
-                 * area or we could do a copy of the data when rendering
+                 * Accept user allocation if it points to a an acceptable
+                 * memory area.
                  */
-                rc = ENOTSUP;
-                goto error;
+                rc = as_area_get_info(alloc->pixels, &info);
+                if (rc != EOK)
+                        goto error;
+
+                /* Pixels should start at the beginning of the area */
+                if (info.start_addr != (uintptr_t) alloc->pixels) {
+                        rc = EINVAL;
+                        goto error;
+                }
+
+                /* Size of area should be size of bitmap rounded up to page size */
+                asize = PAGES2SIZE(SIZE2PAGES(alloc->pitch * dim.y));
+                if (info.size != asize) {
+                        rc = EINVAL;
+                        goto error;
+                }
+
+                ipcbm->alloc = *alloc;
         }
 

uspace/srv/hid/rfb/main.c

@@ -224 +224 @@
         gfx_rect_t drect;
         gfx_coord2_t offs;
+        gfx_coord2_t bmdim;
         gfx_coord2_t dim;
+        gfx_coord_t x, y;
+        pixelmap_t pbm;
+        pixel_t color;
 
         if (srect0 != NULL)
@@ -240 +244 @@
         /* Destination rectangle */
         gfx_rect_translate(&offs, &srect, &drect);
-
         gfx_coord2_subtract(&drect.p1, &drect.p0, &dim);
+        gfx_coord2_subtract(&rfbbm->rect.p1, &rfbbm->rect.p0, &bmdim);
+
+        pbm.width = bmdim.x;
+        pbm.height = bmdim.y;
+        pbm.data = rfbbm->alloc.pixels;
+
+        for (y = srect.p0.y; y < srect.p1.y; y++) {
+                for (x = srect.p0.x; x < srect.p1.x; x++) {
+                        color = pixelmap_get_pixel(&pbm, x, y);
+                        pixelmap_put_pixel(&rfbbm->rfb->rfb.framebuffer,
+                            x + offs.x, y + offs.y, color);
+                }
+        }
+
+        rfb_gc_invalidate_rect(rfbbm->rfb, &drect);
 
         return EOK;