Changeset 0d62c10 in mainline for uspace/drv/fb

Timestamp:

2020-10-09T20:27:24Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f80690a

Parents:

8bf9058

Message:

Rendering text in different colors via colorization

Location:

uspace/drv/fb

Files:

• amdm37x_dispc/amdm37x_dispc.c (modified) (3 diffs)
• amdm37x_dispc/amdm37x_dispc.h (modified) (1 diff)
• kfb/port.c (modified) (3 diffs)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -383 +383 @@
 
         /* Check that we support all required flags */
-        if ((params->flags & ~bmpf_color_key) != 0)
+        if ((params->flags & ~(bmpf_color_key | bmpf_colorize)) != 0)
                 return ENOTSUP;
 
@@ -392 +392 @@
         gfx_coord2_subtract(&params->rect.p1, &params->rect.p0, &dim);
         dcbm->rect = params->rect;
+        dcbm->flags = params->flags;
 
         if (alloc == NULL) {
@@ -487 +488 @@
         gfx_rect_clip(&srect, &skfbrect, &crect);
 
-        // XXX bmpf_color_key
-        for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
-                for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
-                        gfx_coord2_subtract(&pos, &dcbm->rect.p0, &sp);
-                        gfx_coord2_add(&pos, &offs, &dp);
-
-                        color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
-                        dispc->active_fb.pixel2visual(dispc->fb_data +
-                            FB_POS(dispc, dp.x, dp.y), color);
+        if ((dcbm->flags & bmpf_color_key) == 0) {
+                /* Simple copy */
+                for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
+                        for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
+                                gfx_coord2_subtract(&pos, &dcbm->rect.p0, &sp);
+                                gfx_coord2_add(&pos, &offs, &dp);
+
+                                color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
+                                dispc->active_fb.pixel2visual(dispc->fb_data +
+                                    FB_POS(dispc, dp.x, dp.y), color);
+                        }
+                }
+        } else if ((dcbm->flags & bmpf_colorize) == 0) {
+                /* Color key */
+                for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
+                        for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
+                                gfx_coord2_subtract(&pos, &dcbm->rect.p0, &sp);
+                                gfx_coord2_add(&pos, &offs, &dp);
+
+                                color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
+                                if (color != dcbm->key_color) {
+                                        dispc->active_fb.pixel2visual(dispc->fb_data +
+                                            FB_POS(dispc, dp.x, dp.y), color);
+                                }
+                        }
+                }
+        } else {
+                /* Color key & colorize */
+                for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
+                        for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
+                                gfx_coord2_subtract(&pos, &dcbm->rect.p0, &sp);
+                                gfx_coord2_add(&pos, &offs, &dp);
+
+                                color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
+                                if (color != dcbm->key_color) {
+                                        dispc->active_fb.pixel2visual(dispc->fb_data +
+                                            FB_POS(dispc, dp.x, dp.y),
+                                            dcbm->dispc->color);
+                                }
+                        }
                 }
         }

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

@@ -68 +68 @@
 
 typedef struct {
+        /* Containing display controller */
         amdm37x_dispc_t *dispc;
+        /** Allocation info */
         gfx_bitmap_alloc_t alloc;
+        /** @c true if we allocated the bitmap, @c false if allocated by caller */
+        bool myalloc;
+        /** Rectangle covered by bitmap */
         gfx_rect_t rect;
-        bool myalloc;
+        /** Bitmap flags */
+        gfx_bitmap_flags_t flags;
+        /** Key color */
+        pixel_t key_color;
 } amdm37x_bitmap_t;
 

uspace/drv/fb/kfb/port.c

@@ -200 +200 @@
 
         /* Check that we support all required flags */
-        if ((params->flags & ~bmpf_color_key) != 0)
+        if ((params->flags & ~(bmpf_color_key | bmpf_colorize)) != 0)
                 return ENOTSUP;
 
@@ -307 +307 @@
 
         if ((kfbbm->flags & bmpf_color_key) != 0) {
+                /* Simple copy */
                 for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
                         for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
@@ -319 +320 @@
                         }
                 }
+        } else if ((kfbbm->flags & bmpf_colorize) != 0) {
+                /* Color key */
+                for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
+                        for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {
+                                gfx_coord2_subtract(&pos, &kfbbm->rect.p0, &sp);
+                                gfx_coord2_add(&pos, &offs, &dp);
+
+                                color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
+                                kfb->pixel2visual(kfb->addr +
+                                    FB_POS(kfb, dp.x, dp.y), color);
+                        }
+                }
         } else {
+                /* Color key & colorize */
                 for (pos.y = crect.p0.y; pos.y < crect.p1.y; pos.y++) {
                         for (pos.x = crect.p0.x; pos.x < crect.p1.x; pos.x++) {