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

Timestamp:

2020-06-03T16:36:35Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

978c9bc5

Parents:

f8375f7

Message:

Use memory GC to render window in display server

File:

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

uspace/lib/memgfx/src/memgc.c

@@ -95 +95 @@
         mem_gc_t *mgc = (mem_gc_t *) arg;
         gfx_rect_t crect;
-        gfx_coord2_t dims;
         gfx_coord_t x, y;
         pixelmap_t pixelmap;
@@ -102 +101 @@
         gfx_rect_clip(rect, &mgc->rect, &crect);
 
-        gfx_rect_dims(&mgc->rect, &dims);
-        pixelmap.width = dims.x;
-        pixelmap.height = dims.y;
+        assert(mgc->rect.p0.x == 0);
+        assert(mgc->rect.p0.y == 0);
+        assert(mgc->alloc.pitch == mgc->rect.p1.x * (int)sizeof(uint32_t));
+        pixelmap.width = mgc->rect.p1.x;
+        pixelmap.height = mgc->rect.p1.y;
         pixelmap.data = mgc->alloc.pixels;
 
@@ -150 +151 @@
         mgc->alloc = *alloc;
 
-        /*
-         * These are the limitations of pixelmap which we are using.
-         * Rather than falling back to an ad-hoc method of pixel access
-         * (which is not searchable), use pixelmap for now and switch
-         * to a better, more universal method later (e.g. supporting
-         * different color depths).
-         */
-        assert(rect->p0.x == 0);
-        assert(rect->p0.y == 0);
-        assert(alloc->pitch == rect->p1.x * (int)sizeof(uint32_t));
-
         mgc->update = update_cb;
         mgc->cb_arg = cb_arg;
@@ -187 +177 @@
         free(mgc);
         return EOK;
+}
+
+/** Retarget memory GC to a different block of memory.
+ *
+ * @param mgc Memory GC
+ * @param rect New bounding rectangle
+ * @param alloc Allocation info of the new block
+ */
+void mem_gc_retarget(mem_gc_t *mgc, gfx_rect_t *rect,
+    gfx_bitmap_alloc_t *alloc)
+{
+        mgc->rect = *rect;
+        mgc->alloc = *alloc;
 }
 
@@ -283 +286 @@
         gfx_coord2_t dim;
         gfx_coord_t x, y;
-        gfx_coord2_t sdims;
-        gfx_coord2_t ddims;
         pixelmap_t smap;
         pixelmap_t dmap;
@@ -306 +307 @@
         gfx_coord2_subtract(&drect.p1, &drect.p0, &dim);
 
-        gfx_rect_dims(&mbm->rect, &sdims);
-        smap.width = sdims.x;
-        smap.height = sdims.y;
+        assert(mbm->rect.p0.x == 0);
+        assert(mbm->rect.p0.y == 0);
+        assert(mbm->alloc.pitch == mbm->rect.p1.x * (int)sizeof(uint32_t));
+        smap.width = mbm->rect.p1.x;
+        smap.height = mbm->rect.p1.y;
         smap.data = mbm->alloc.pixels;
 
-        gfx_rect_dims(&mbm->mgc->rect, &ddims);
-        dmap.width = ddims.x;
-        dmap.height = ddims.y;
+        assert(mbm->mgc->rect.p0.x == 0);
+        assert(mbm->mgc->rect.p0.y == 0);
+        assert(mbm->mgc->alloc.pitch == mbm->mgc->rect.p1.x * (int)sizeof(uint32_t));
+        dmap.width = mbm->mgc->rect.p1.x;
+        dmap.height = mbm->mgc->rect.p1.y;
         dmap.data = mbm->mgc->alloc.pixels;