add pixman_g2d

awtk_config.py

@@ -163,8 +163,9 @@
 if VGCANVAS == 'CAIRO':
     NANOVG_BACKEND_LIBS = ['cairo', 'pixman']
     NANOVG_BACKEND_PROJS = ['3rd/cairo/SConscript', '3rd/pixman/SConscript']
-    COMMON_CCFLAGS = COMMON_CCFLAGS + \
-        ' -DWITH_VGCANVAS_CAIRO -DHAVE_CONFIG_H -DCAIRO_WIN32_STATIC_BUILD '
+    COMMON_CCFLAGS = COMMON_CCFLAGS + ' -DWITH_VGCANVAS_CAIRO -DHAVE_CONFIG_H -DCAIRO_WIN32_STATIC_BUILD '
+    COMMON_CCFLAGS = COMMON_CCFLAGS + ' -DWITH_BITMAP_PREMULTI_ALPHA -DWITH_PIXMAN_G2D -DWITH_G2D -DWITHOUT_DEFAULT_G2D '
+
 elif VGCANVAS == 'NANOVG_PLUS':
     NANOVG_BACKEND_LIBS = ['nanovg_plus']
     NANOVG_BACKEND_PROJS = ['3rd/nanovg_plus/SConscript']

docs/changes.md

@@ -1,5 +1,8 @@
 # 最新动态
 
+2024/12/05
+  * 增加pixman_g2d.c，在使用cairo时自动启用。
+
 2024/12/02
   * 修正 edit 未处理 key down 事件时不应返回 RET_STOP 的问题(感谢朝泽提供补丁)
   * Windows 下原生窗口无标题栏时允许拖动原生窗口(感谢俊杰提供补丁)

src/awtk_global.c

@@ -345,6 +345,10 @@ ret_t tk_init(wh_t w, wh_t h, app_type_t app_type, const char* app_name, const c
   tk_socket_init();
 #endif /*WITH_SOCKET*/
 
+#ifdef WITH_G2D
+  tk_g2d_init();
+#endif /*WITH_G2D*/
+
   return RET_OK;
 }
 
@@ -442,6 +446,10 @@ ret_t tk_deinit_internal(void) {
   tk_socket_deinit();
 #endif /*WITH_SOCKET*/
 
+#ifdef WITH_G2D
+  tk_g2d_deinit();
+#endif /*WITH_G2D*/
+
   return RET_OK;
 }
 

src/base/g2d.h

@@ -122,6 +122,22 @@ ret_t g2d_blend_image(bitmap_t* fb, bitmap_t* img, const rect_t* dst, const rect
 ret_t g2d_blend_image_rotate(bitmap_t* dst, bitmap_t* src, const rectf_t* dst_r,
                              const rectf_t* src_r, uint8_t alpha, lcd_orientation_t o);
 
+/**
+ * @method tk_g2d_init
+ * @export none
+ * 初始化g2d模块。
+ * @return {ret_t} 返回RET_OK表示成功，否则表示失败。
+ */
+ret_t tk_g2d_init(void);
+
+/**
+ * @method tk_g2d_deinit
+ * @export none
+ * 反初始化g2d模块。
+ * @return {ret_t} 返回RET_OK表示成功，否则表示失败。
+ */
+ret_t tk_g2d_deinit(void);
+
 END_C_DECLS
 
 #endif /*TK_G2D_H*/

src/blend/pixman_g2d.c

@@ -0,0 +1,187 @@
+
+/**
+ * File:   pixman_g2d.c
+ * Author: AWTK Develop Team
+ * Brief:  g2d base on pixman.
+ *
+ * Copyright (c) 2024 - 2024  Guangzhou ZHIYUAN Electronics Co.,Ltd.
+ *
+ * this program is distributed in the hope that it will be useful,
+ * but without any warranty; without even the implied warranty of
+ * merchantability or fitness for a particular purpose.  see the
+ * license file for more details.
+ *
+ */
+
+/**
+ * history:
+ * ================================================================
+ * 2024-12-05 li xianjing <[email protected]> created
+ *
+ */
+
+#ifdef WITH_PIXMAN_G2D
+
+#include "pixman/config.h"
+#include "pixman/pixman-private.h"
+#include "pixman/pixman.h"
+#undef return_if_fail
+
+#include "base/g2d.h"
+#include "blend/soft_g2d.h"
+#include "blend/image_g2d.h"
+
+static pixman_format_code_t pixman_format_code_from_bitmap_fmt(bitmap_format_t format) {
+  switch (format) {
+    case BITMAP_FMT_BGR565:
+      return PIXMAN_r5g6b5;
+    case BITMAP_FMT_RGB565:
+      return PIXMAN_b5g6r5;
+    case BITMAP_FMT_BGRA8888:
+      return PIXMAN_a8r8g8b8;
+    case BITMAP_FMT_RGBA8888:
+      return PIXMAN_a8b8g8r8;
+    case BITMAP_FMT_ARGB8888:
+      return PIXMAN_b8g8r8a8;
+    case BITMAP_FMT_ABGR8888:
+      return PIXMAN_r8g8b8a8;
+    case BITMAP_FMT_RGB888:
+      return PIXMAN_b8g8r8;
+    case BITMAP_FMT_BGR888:
+      return PIXMAN_r8g8b8;
+    case BITMAP_FMT_GRAY:
+      return PIXMAN_a8;
+    case BITMAP_FMT_MONO:
+      return PIXMAN_a1;
+    default:
+      assert(0);
+      return PIXMAN_a8b8g8r8;
+  }
+}
+
+static pixman_image_t* s_share_pixman_image_dst = NULL;
+static pixman_image_t* s_share_pixman_image_src = NULL;
+
+static pixman_image_t* pixman_image_get_dst(bitmap_t* fb) {
+  pixman_format_code_t format = pixman_format_code_from_bitmap_fmt(fb->format);
+  uint8_t* data = bitmap_lock_buffer_for_write(fb);
+  int line_length = bitmap_get_line_length(fb);
+  return_value_if_fail(data != NULL, NULL);
+
+  if (s_share_pixman_image_dst == NULL) {
+    s_share_pixman_image_dst =
+        pixman_image_create_bits(format, fb->w, fb->h, (uint32_t*)data, line_length);
+  } else {
+    _pixman_bits_image_init(s_share_pixman_image_dst, format, fb->w, fb->h, (uint32_t*)data,
+                            line_length / sizeof(uint32_t), FALSE);
+  }
+
+  return s_share_pixman_image_dst;
+}
+
+static pixman_image_t* pixman_image_get_src(bitmap_t* fb) {
+  pixman_format_code_t format = pixman_format_code_from_bitmap_fmt(fb->format);
+  uint8_t* data = bitmap_lock_buffer_for_read(fb);
+  int line_length = bitmap_get_line_length(fb);
+  return_value_if_fail(data != NULL, NULL);
+
+  if (s_share_pixman_image_src == NULL) {
+    s_share_pixman_image_src =
+        pixman_image_create_bits(format, fb->w, fb->h, (uint32_t*)data, line_length);
+  } else {
+    _pixman_bits_image_init(s_share_pixman_image_src, format, fb->w, fb->h, (uint32_t*)data,
+                            line_length / sizeof(uint32_t), FALSE);
+  }
+
+  return s_share_pixman_image_src;
+}
+
+static pixman_color_t pixman_color_from_color(color_t c) {
+  pixman_color_t color;
+
+  color.red = c.rgba.r << 8;
+  color.green = c.rgba.g << 8;
+  color.blue = c.rgba.b << 8;
+  color.alpha = c.rgba.a << 8;
+
+  return color;
+}
+
+static pixman_rectangle16_t pixman_rectangle16_from_rect(const rect_t* r) {
+  pixman_rectangle16_t rect = {0, 0, 0, 0};
+  return_value_if_fail(r != NULL, rect);
+
+  rect.x = r->x;
+  rect.y = r->y;
+  rect.width = r->w;
+  rect.height = r->h;
+
+  return rect;
+}
+
+ret_t g2d_fill_rect(bitmap_t* fb, const rect_t* dst, color_t c) {
+  pixman_image_t* img = pixman_image_get_dst(fb);
+  pixman_color_t fill_color = pixman_color_from_color(c);
+  pixman_rectangle16_t rect = pixman_rectangle16_from_rect(dst);
+  return_value_if_fail(fb != NULL && dst != NULL, RET_OK);
+
+  if (c.rgba.a == 0xff) {
+    pixman_image_fill_rectangles(PIXMAN_OP_SRC, img, &fill_color, 1, &rect);
+  } else {
+    pixman_image_fill_rectangles(PIXMAN_OP_OVER, img, &fill_color, 1, &rect);
+  }
+  bitmap_unlock_buffer(fb);
+
+  return RET_OK;
+}
+
+ret_t g2d_copy_image(bitmap_t* fb, bitmap_t* img, const rect_t* src, xy_t x, xy_t y) {
+  pixman_image_t* dst_img = pixman_image_get_dst(fb);
+  pixman_image_t* src_img = pixman_image_get_src(img);
+  return_value_if_fail(fb != NULL && img != NULL && src != NULL, RET_OK);
+
+  pixman_image_composite(PIXMAN_OP_SRC, src_img, NULL, dst_img, src->x, src->y, 0, 0, x, y, src->w,
+                         src->h);
+
+  bitmap_unlock_buffer(fb);
+  bitmap_unlock_buffer(img);
+
+  return RET_OK;
+}
+
+ret_t g2d_rotate_image(bitmap_t* fb, bitmap_t* img, const rect_t* src, lcd_orientation_t o) {
+  return RET_NOT_IMPL;
+}
+
+ret_t g2d_blend_image(bitmap_t* fb, bitmap_t* img, const rect_t* dst, const rect_t* src,
+                      uint8_t global_alpha) {
+  pixman_image_t* dst_img = pixman_image_get_dst(fb);
+  pixman_image_t* src_img = pixman_image_get_src(img);
+  return_value_if_fail(fb != NULL && img != NULL && src != NULL, RET_OK);
+
+  pixman_image_composite(PIXMAN_OP_OVER, src_img, NULL, dst_img, src->x, src->y, 0, 0, dst->x,
+                         dst->y, src->w, src->h);
+
+  bitmap_unlock_buffer(fb);
+  bitmap_unlock_buffer(img);
+
+  return RET_OK;
+}
+
+ret_t tk_g2d_init(void) {
+  return RET_OK;
+}
+
+ret_t tk_g2d_deinit(void) {
+  if (s_share_pixman_image_dst != NULL) {
+    pixman_image_unref(s_share_pixman_image_dst);
+    s_share_pixman_image_dst = NULL;
+  }
+
+  if (s_share_pixman_image_src != NULL) {
+    pixman_image_unref(s_share_pixman_image_src);
+    s_share_pixman_image_src = NULL;
+  }
+  return RET_OK;
+}
+#endif /*WITH_PIXMAN_G2D*/

src/blend/stm32_g2d.c

@@ -286,4 +286,12 @@ ret_t g2d_blend_image(bitmap_t* fb, bitmap_t* img, const rect_t* dst, const rect
 
   return RET_OK;
 }
+
+ret_t tk_g2d_init(void) {
+  return RET_OK;
+}
+
+ret_t tk_g2d_deinit(void) {
+  return RET_OK;
+}
 #endif /*WITH_STM32_G2D*/