Changeset 7470d97 in mainline for uspace/drv/fb

Timestamp:

2021-04-30T15:05:06Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051349b

Parents:

252d03c

Message:

Add GC operation to set clipping rectangle

The number of changed files is due to the proliferation of GC
implementations, mostly these are just dummies in unit tests.
Definitely need to tame those in the future.

Location:

uspace/drv/fb

Files:

• amdm37x_dispc/amdm37x_dispc.c (modified) (7 diffs)
• amdm37x_dispc/amdm37x_dispc.h (modified) (2 diffs)
• kfb/port.c (modified) (8 diffs)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
@@ -67 +67 @@
 static errno_t amdm37x_ddev_get_info(void *, ddev_info_t *);
 
+static errno_t amdm37x_gc_set_clip_rect(void *, gfx_rect_t *);
 static errno_t amdm37x_gc_set_color(void *, gfx_color_t *);
 static errno_t amdm37x_gc_fill_rect(void *, gfx_rect_t *);
@@ -81 +82 @@
 
 gfx_context_ops_t amdm37x_gc_ops = {
+        .set_clip_rect = amdm37x_gc_set_clip_rect,
         .set_color = amdm37x_gc_set_color,
         .fill_rect = amdm37x_gc_fill_rect,
@@ -291 +293 @@
         dispc->rect.p1.x = x;
         dispc->rect.p1.y = y;
+        dispc->clip_rect = dispc->rect;
         dispc->size = size;
 
@@ -321 +324 @@
 }
 
+/** Set clipping rectangle on AMDM37x display controller.
+ *
+ * @param arg AMDM37x display controller
+ * @param rect Rectangle
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t amdm37x_gc_set_clip_rect(void *arg, gfx_rect_t *rect)
+{
+        amdm37x_dispc_t *dispc = (amdm37x_dispc_t *) arg;
+
+        if (rect != NULL)
+                gfx_rect_clip(rect, &dispc->rect, &dispc->clip_rect);
+        else
+                dispc->clip_rect = dispc->rect;
+
+        return EOK;
+}
+
 /** Set color on AMDM37x display controller.
  *
@@ -354 +376 @@
 
         /* Make sure we have a sorted, clipped rectangle */
-        gfx_rect_clip(rect, &dispc->rect, &crect);
+        gfx_rect_clip(rect, &dispc->clip_rect, &crect);
 
         for (y = crect.p0.y; y < crect.p1.y; y++) {
@@ -479 +501 @@
         pbm.data = dcbm->alloc.pixels;
 
-        /* Transform AMDM37x bounding rectangle back to bitmap coordinate system */
-        gfx_rect_rtranslate(&offs, &dispc->rect, &skfbrect);
+        /* Transform AMDM37x clipping rectangle back to bitmap coordinate system */
+        gfx_rect_rtranslate(&offs, &dispc->clip_rect, &skfbrect);
 
         /*

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
@@ -63 +63 @@
         pixel_t color;
         gfx_rect_t rect;
+        gfx_rect_t clip_rect;
         size_t size;
         void *fb_data;

uspace/drv/fb/kfb/port.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2006 Jakub Vana
  * Copyright (c) 2006 Ondrej Palkovsky
@@ -69 +69 @@
         sysarg_t paddr;
         gfx_rect_t rect;
+        gfx_rect_t clip_rect;
         size_t offset;
         size_t scanline;
@@ -97 +98 @@
 static errno_t kfb_ddev_get_info(void *, ddev_info_t *);
 
+static errno_t kfb_gc_set_clip_rect(void *, gfx_rect_t *);
 static errno_t kfb_gc_set_color(void *, gfx_color_t *);
 static errno_t kfb_gc_fill_rect(void *, gfx_rect_t *);
@@ -111 +113 @@
 
 static gfx_context_ops_t kfb_gc_ops = {
+        .set_clip_rect = kfb_gc_set_clip_rect,
         .set_color = kfb_gc_set_color,
         .fill_rect = kfb_gc_fill_rect,
@@ -134 +137 @@
         ddev_info_init(info);
         info->rect = kfb->rect;
+        return EOK;
+}
+
+/** Set clipping rectangle on KFB.
+ *
+ * @param arg KFB
+ * @param rect Rectangle or @c NULL
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t kfb_gc_set_clip_rect(void *arg, gfx_rect_t *rect)
+{
+        kfb_t *kfb = (kfb_t *) arg;
+
+        if (rect != NULL)
+                gfx_rect_clip(rect, &kfb->rect, &kfb->clip_rect);
+        else
+                kfb->clip_rect = kfb->rect;
+
         return EOK;
 }
@@ -361 +383 @@
 }
 
-#include <stdio.h>
 static void kfb_client_conn(ipc_call_t *icall, void *arg)
 {
@@ -372 +393 @@
         kfb = (kfb_t *) ddf_fun_data_get((ddf_fun_t *) arg);
 
-        printf("kfb_client_conn arg2=%lu arg3=%lu arg4=%lu\n",
-            (unsigned long) ipc_get_arg2(icall),
-            (unsigned long) ipc_get_arg3(icall),
-            (unsigned long) ipc_get_arg4(icall));
-
         gc_id = ipc_get_arg3(icall);
 
@@ -500 +516 @@
         kfb->rect.p1.x = width;
         kfb->rect.p1.y = height;
+
+        kfb->clip_rect = kfb->rect;
 
         kfb->paddr = paddr;