Changeset afcf704 in mainline for uspace/lib/memgfx/src/memgc.c

Timestamp:

2020-06-14T22:23:34Z (4 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

File:

• uspace/lib/memgfx/src/memgc.c (modified) (6 diffs)

uspace/lib/memgfx/src/memgc.c

@@ -37 +37 @@
  */
 
+#include <as.h>
 #include <assert.h>
 #include <gfx/color.h>
@@ -223 +224 @@
         errno_t rc;
 
+        /* Check that we support all requested flags */
+        if ((params->flags & ~(bmpf_color_key | bmpf_direct_output)) != 0)
+                return ENOTSUP;
+
         mbm = calloc(1, sizeof(mem_gc_bitmap_t));
         if (mbm == NULL)
@@ -232 +237 @@
         mbm->key_color = params->key_color;
 
-        if (alloc == NULL) {
+        if ((params->flags & bmpf_direct_output) != 0) {
+                /* Caller cannot specify allocation for direct output */
+                if (alloc != NULL) {
+                        rc = EINVAL;
+                        goto error;
+                }
+
+                /* Bounding rectangle must be within GC bounding rectangle */
+                if (!gfx_rect_is_inside(&mbm->rect, &mgc->rect)) {
+                        rc = EINVAL;
+                        goto error;
+                }
+
+                mbm->alloc = mgc->alloc;
+
+                /* Don't free pixel array when destroying bitmap */
+                mbm->myalloc = false;
+        } else if (alloc == NULL) {
+#if 0
+                /*
+                 * TODO: If the bitmap is not required to be sharable,
+                 * we could allocate it with a simple malloc.
+                 * Need to have a bitmap flag specifying that the
+                 * allocation should be sharable. IPC GC could
+                 * automatically add this flag
+                 */
                 mbm->alloc.pitch = dim.x * sizeof(uint32_t);
                 mbm->alloc.off0 = 0;
@@ -242 +272 @@
                         goto error;
                 }
+#endif
+                mbm->alloc.pitch = dim.x * sizeof(uint32_t);
+                mbm->alloc.off0 = 0;
+                mbm->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);
+                mbm->myalloc = true;
+
+                if (mbm->alloc.pixels == AS_MAP_FAILED) {
+                        rc = ENOMEM;
+                        goto error;
+                }
         } else {
                 mbm->alloc = *alloc;
@@ -263 +305 @@
 {
         mem_gc_bitmap_t *mbm = (mem_gc_bitmap_t *)bm;
-        if (mbm->myalloc)
+        if (mbm->myalloc) {
+#if 0
+                /* TODO: if we alloc allocating the bitmap with malloc */
                 free(mbm->alloc.pixels);
+#endif
+                as_area_destroy(mbm->alloc.pixels);
+        }
 
         free(mbm);
@@ -317 +364 @@
         dmap.data = mbm->mgc->alloc.pixels;
 
-        if ((mbm->flags & bmpf_color_key) == 0) {
+        if ((mbm->flags & bmpf_direct_output) != 0) {
+                /* Nothing to do */
+        } else if ((mbm->flags & bmpf_color_key) == 0) {
                 for (y = drect.p0.y; y < drect.p1.y; y++) {
                         for (x = drect.p0.x; x < drect.p1.x; x++) {