Add single-step blend-optimized paths to blit3

Author: GrieferAtWork

kos/include/libvideo/gfx/gfx.h

@@ -848,7 +848,11 @@ struct video_blitter {
 
 /* 3-way video blitter. Meant to be used to perform a blit  whilst
  * retaining/enforcing some sort of overlay whose dimensions match
- * that of the blit (write-)destination. */
+ * that of the blit (write-)destination.
+ *
+ * NOTE: Only the intersection of rects in "vbt3_rddst" / "vbt3_wrdst"
+ *       actually gets blitted!
+ */
 struct video_blitter3 {
 	struct video_blitter3_ops const *vbt3_ops;    /* Blitter operators */
 	/* WARNING: After initialization, the following fields must no longer be accessed by the user! */

kos/src/apps/showpic/main.c

@@ -345,7 +345,7 @@ do_showpic(struct screen_buffer *screen,
 #elif 1
 	{
 		struct video_gfx flipgfx = image_gfx;
-		video_gfx_lrot90(&flipgfx);
+//		video_gfx_lrot90(&flipgfx);
 		video_gfx_setblend(&flipgfx, GFX_BLENDMODE_ALPHA_OVERRIDE(200));
 		video_gfx_stretch3(&screen_gfx, blit_x, blit_y,
 		                   &flipgfx, 0, 0,

kos/src/libvideo/gfx/swgfx-hl.c

@@ -227,16 +227,29 @@ libvideo_swgfx_blitfrom3(struct video_blitter3 *__restrict ctx) {
 		}
 
 		/* TODO: Special handling when buffers overlap */
-		/* TODO: Dedicated optimizations */
+		/* TODO: More dedicated optimizations */
 
-		drv->bsw3_blit         = &libvideo_swblitter3__blit__generic;
-		drv->bsw3_blit_imatrix = &libvideo_swblitter3__blit_imatrix__generic;
-		if (src_gfx->vx_flags & VIDEO_GFX_F_LINEAR) {
-			drv->bsw3_stretch         = &libvideo_swblitter3__stretch__generic_l;
-			drv->bsw3_stretch_imatrix = &libvideo_swblitter3__stretch_imatrix__generic_l;
+		if likely(GFX_BLENDMODE_GET_MODE(wrdst_gfx->vx_blend) == GFX_BLENDMODE_OVERRIDE) {
+			/* Special optimization for likely case where "wrdst_gfx" doesn't do any blending */
+			drv->bsw3_blit         = &libvideo_swblitter3__blit__blend1;
+			drv->bsw3_blit_imatrix = &libvideo_swblitter3__blit_imatrix__blend1;
+			if (src_gfx->vx_flags & VIDEO_GFX_F_LINEAR) {
+				drv->bsw3_stretch         = &libvideo_swblitter3__stretch__blend1_l;
+				drv->bsw3_stretch_imatrix = &libvideo_swblitter3__stretch_imatrix__blend1_l;
+			} else {
+				drv->bsw3_stretch         = &libvideo_swblitter3__stretch__blend1_n;
+				drv->bsw3_stretch_imatrix = &libvideo_swblitter3__stretch_imatrix__blend1_n;
+			}
 		} else {
-			drv->bsw3_stretch         = &libvideo_swblitter3__stretch__generic_n;
-			drv->bsw3_stretch_imatrix = &libvideo_swblitter3__stretch_imatrix__generic_n;
+			drv->bsw3_blit         = &libvideo_swblitter3__blit__generic;
+			drv->bsw3_blit_imatrix = &libvideo_swblitter3__blit_imatrix__generic;
+			if (src_gfx->vx_flags & VIDEO_GFX_F_LINEAR) {
+				drv->bsw3_stretch         = &libvideo_swblitter3__stretch__generic_l;
+				drv->bsw3_stretch_imatrix = &libvideo_swblitter3__stretch_imatrix__generic_l;
+			} else {
+				drv->bsw3_stretch         = &libvideo_swblitter3__stretch__generic_n;
+				drv->bsw3_stretch_imatrix = &libvideo_swblitter3__stretch_imatrix__generic_n;
+			}
 		}
 	}
 	return ctx;

kos/src/libvideo/gfx/swgfx.h

@@ -797,6 +797,13 @@ INTDEF ATTR_IN(1) void CC libvideo_swblitter3__stretch__generic_n(struct video_b
 INTDEF ATTR_IN(1) void CC libvideo_swblitter3__blit_imatrix__generic(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_imatrix2d_t dst_matrix, video_coord_t src_x, video_coord_t src_y, video_dim_t size_x, video_dim_t size_y, video_imatrix2d_t src_matrix);
 INTDEF ATTR_IN(1) void CC libvideo_swblitter3__stretch_imatrix__generic_l(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_dim_t dst_size_x, video_dim_t dst_size_y, video_imatrix2d_t dst_matrix, video_coord_t src_x, video_coord_t src_y, video_dim_t src_size_x, video_dim_t src_size_y, video_imatrix2d_t src_matrix);
 INTDEF ATTR_IN(1) void CC libvideo_swblitter3__stretch_imatrix__generic_n(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_dim_t dst_size_x, video_dim_t dst_size_y, video_imatrix2d_t dst_matrix, video_coord_t src_x, video_coord_t src_y, video_dim_t src_size_x, video_dim_t src_size_y, video_imatrix2d_t src_matrix);
+/* Same as versions above, but `vbt3_wrdst' doesn't do any extra blending */
+INTDEF ATTR_IN(1) void CC libvideo_swblitter3__blit__blend1(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_coord_t src_x, video_coord_t src_y, video_dim_t size_x, video_dim_t size_y);
+INTDEF ATTR_IN(1) void CC libvideo_swblitter3__stretch__blend1_l(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_dim_t dst_size_x, video_dim_t dst_size_y, video_coord_t src_x, video_coord_t src_y, video_dim_t src_size_x, video_dim_t src_size_y);
+INTDEF ATTR_IN(1) void CC libvideo_swblitter3__stretch__blend1_n(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_dim_t dst_size_x, video_dim_t dst_size_y, video_coord_t src_x, video_coord_t src_y, video_dim_t src_size_x, video_dim_t src_size_y);
+INTDEF ATTR_IN(1) void CC libvideo_swblitter3__blit_imatrix__blend1(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_imatrix2d_t dst_matrix, video_coord_t src_x, video_coord_t src_y, video_dim_t size_x, video_dim_t size_y, video_imatrix2d_t src_matrix);
+INTDEF ATTR_IN(1) void CC libvideo_swblitter3__stretch_imatrix__blend1_l(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_dim_t dst_size_x, video_dim_t dst_size_y, video_imatrix2d_t dst_matrix, video_coord_t src_x, video_coord_t src_y, video_dim_t src_size_x, video_dim_t src_size_y, video_imatrix2d_t src_matrix);
+INTDEF ATTR_IN(1) void CC libvideo_swblitter3__stretch_imatrix__blend1_n(struct video_blitter3 const *__restrict self, video_coord_t out_x, video_coord_t out_y, video_coord_t dst_x, video_coord_t dst_y, video_dim_t dst_size_x, video_dim_t dst_size_y, video_imatrix2d_t dst_matrix, video_coord_t src_x, video_coord_t src_y, video_dim_t src_size_x, video_dim_t src_size_y, video_imatrix2d_t src_matrix);
 
 /* Generic blit3 operators (hl) */
 INTDEF ATTR_IN(1) void CC libvideo_swblitter3_blit(struct video_blitter3 const *__restrict self, video_offset_t wrdst_x, video_offset_t wrdst_y, video_offset_t rddst_x, video_offset_t rddst_y, video_offset_t src_x, video_offset_t src_y, video_dim_t size_x, video_dim_t size_y);