Changeset 2ab8ab3 in mainline for uspace/lib/memgfx/test/memgfx.c

Timestamp:

2021-02-16T18:12:05Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68a552f

Parents:

ef734b7

Message:

Client-side UI rendering

It is possible to turn on and off and if turned on, one can also
enable or disable window double buffering (currently both options
are build-time).

File:

• uspace/lib/memgfx/test/memgfx.c (modified) (13 diffs)

uspace/lib/memgfx/test/memgfx.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
 PCUT_TEST_SUITE(memgfx);
 
-static void test_update_rect(void *arg, gfx_rect_t *rect);
+static void test_invalidate_rect(void *arg, gfx_rect_t *rect);
+static void test_update(void *arg);
 
 typedef struct {
+        /** True if invalidate was called */
+        bool invalidate_called;
+        /** Invalidate rectangle */
+        gfx_rect_t inv_rect;
         /** True if update was called */
         bool update_called;
-        /** Update rectangle */
-        gfx_rect_t rect;
-} test_update_t;
+} test_resp_t;
 
 /** Test creating and deleting a memory GC */
@@ -69 +72 @@
         PCUT_ASSERT_NOT_NULL(alloc.pixels);
 
-        rc = mem_gc_create(&rect, &alloc, NULL, NULL, &mgc);
+        rc = mem_gc_create(&rect, &alloc, NULL, NULL, NULL, &mgc);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -89 +92 @@
         pixel_t pixel;
         pixel_t expected;
-        test_update_t update;
+        test_resp_t resp;
         errno_t rc;
 
@@ -103 +106 @@
         PCUT_ASSERT_NOT_NULL(alloc.pixels);
 
-        rc = mem_gc_create(&rect, &alloc, test_update_rect, &update, &mgc);
+        rc = mem_gc_create(&rect, &alloc, test_invalidate_rect,
+            test_update, &resp, &mgc);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -122 +126 @@
         frect.p1.y = 5;
 
-        memset(&update, 0, sizeof(update));
+        memset(&resp, 0, sizeof(resp));
 
         rc = gfx_fill_rect(gc, &frect);
@@ -141 +145 @@
         }
 
-        /* Check that the update rect is equal to the filled rect */
-        PCUT_ASSERT_TRUE(update.update_called);
-        PCUT_ASSERT_INT_EQUALS(frect.p0.x, update.rect.p0.x);
-        PCUT_ASSERT_INT_EQUALS(frect.p0.y, update.rect.p0.y);
-        PCUT_ASSERT_INT_EQUALS(frect.p1.x, update.rect.p1.x);
-        PCUT_ASSERT_INT_EQUALS(frect.p1.y, update.rect.p1.y);
+        /* Check that the invalidate rect is equal to the filled rect */
+        PCUT_ASSERT_TRUE(resp.invalidate_called);
+        PCUT_ASSERT_INT_EQUALS(frect.p0.x, resp.inv_rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(frect.p0.y, resp.inv_rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(frect.p1.x, resp.inv_rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(frect.p1.y, resp.inv_rect.p1.y);
 
         /* TODO: Check clipping once memgc can support pitch != width etc. */
@@ -169 +173 @@
         pixel_t pixel;
         pixel_t expected;
-        test_update_t update;
+        test_resp_t resp;
         errno_t rc;
 
@@ -183 +187 @@
         PCUT_ASSERT_NOT_NULL(alloc.pixels);
 
-        rc = mem_gc_create(&rect, &alloc, test_update_rect, &update, &mgc);
+        rc = mem_gc_create(&rect, &alloc, test_invalidate_rect,
+            test_update, &resp, &mgc);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -191 +196 @@
         /* Create bitmap */
 
+        gfx_bitmap_params_init(&params);
         params.rect.p0.x = 0;
         params.rect.p0.y = 0;
@@ -219 +225 @@
         dpmap.data = alloc.pixels;
 
-        memset(&update, 0, sizeof(update));
+        memset(&resp, 0, sizeof(resp));
 
         /* Render the bitmap */
@@ -237 +243 @@
         }
 
-        /* Check that the update rect is equal to the filled rect */
-        PCUT_ASSERT_TRUE(update.update_called);
-        PCUT_ASSERT_INT_EQUALS(params.rect.p0.x, update.rect.p0.x);
-        PCUT_ASSERT_INT_EQUALS(params.rect.p0.y, update.rect.p0.y);
-        PCUT_ASSERT_INT_EQUALS(params.rect.p1.x, update.rect.p1.x);
-        PCUT_ASSERT_INT_EQUALS(params.rect.p1.y, update.rect.p1.y);
+        /* Check that the invalidate rect is equal to the filled rect */
+        PCUT_ASSERT_TRUE(resp.invalidate_called);
+        PCUT_ASSERT_INT_EQUALS(params.rect.p0.x, resp.inv_rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(params.rect.p0.y, resp.inv_rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(params.rect.p1.x, resp.inv_rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(params.rect.p1.y, resp.inv_rect.p1.y);
 
         /* TODO: Check clipping once memgc can support pitch != width etc. */
@@ -250 +256 @@
 }
 
-/** Called by memory GC when a rectangle is updated. */
-static void test_update_rect(void *arg, gfx_rect_t *rect)
-{
-        test_update_t *update = (test_update_t *)arg;
-
-        update->update_called = true;
-        update->rect = *rect;
+/** Test gfx_update() on a memory GC */
+PCUT_TEST(gfx_update)
+{
+        mem_gc_t *mgc;
+        gfx_rect_t rect;
+        gfx_bitmap_alloc_t alloc;
+        gfx_context_t *gc;
+        test_resp_t resp;
+        errno_t rc;
+
+        /* Bounding rectangle for memory GC */
+        rect.p0.x = 0;
+        rect.p0.y = 0;
+        rect.p1.x = 10;
+        rect.p1.y = 10;
+
+        alloc.pitch = (rect.p1.x - rect.p0.x) * sizeof(uint32_t);
+        alloc.off0 = 0;
+        alloc.pixels = calloc(1, alloc.pitch * (rect.p1.y - rect.p0.y));
+        PCUT_ASSERT_NOT_NULL(alloc.pixels);
+
+        rc = mem_gc_create(&rect, &alloc, test_invalidate_rect,
+            test_update, &resp, &mgc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gc = mem_gc_get_ctx(mgc);
+        PCUT_ASSERT_NOT_NULL(gc);
+
+        memset(&resp, 0, sizeof(resp));
+        PCUT_ASSERT_FALSE(resp.update_called);
+
+        gfx_update(gc);
+        PCUT_ASSERT_TRUE(resp.update_called);
+
+        mem_gc_delete(mgc);
+        free(alloc.pixels);
+}
+
+/** Called by memory GC when a rectangle is modified. */
+static void test_invalidate_rect(void *arg, gfx_rect_t *rect)
+{
+        test_resp_t *resp = (test_resp_t *)arg;
+
+        resp->invalidate_called = true;
+        resp->inv_rect = *rect;
+}
+
+/** Called by memory GC when update is called. */
+static void test_update(void *arg)
+{
+        test_resp_t *resp = (test_resp_t *)arg;
+
+        resp->update_called = true;
 }