Re-implement video_buffer_fromgfx()

Author: GrieferAtWork

kos/cpp.hint

@@ -2905,3 +2905,4 @@
 	void libvideo_swgfx_preblend__fillstretchmask_l__##n(struct video_gfx const*__restrict self,video_coord_t dst_x,video_coord_t dst_y,video_dim_t dst_size_x,video_dim_t dst_size_y,video_color_t const bg_fg_colors[2],video_dim_t src_size_x,video_dim_t src_size_y,struct video_bitmask const*__restrict bm){}\
 	void libvideo_swgfx_preblend__fillstretchmask_n__##n(struct video_gfx const*__restrict self,video_coord_t dst_x,video_coord_t dst_y,video_dim_t dst_size_x,video_dim_t dst_size_y,video_color_t const bg_fg_colors[2],video_dim_t src_size_x,video_dim_t src_size_y,struct video_bitmask const*__restrict bm){}
 #define GFX_FOREACH_DEDICATED_PREBLENDMODE(cb)cb(alpha,0,alpha_premultiplied,gfx_preblend_alpha)cb(alpha_factor,0,alpha_premultiplied,gfx_preblend_alpha_factor)cb(alpha_override,0,alpha_premultiplied,gfx_preblend_alpha_override)cb(add,0,add_premultiplied,gfx_preblend_add)
+#define DEFINE_VIDEO_BUFFER_TYPE(name,...) struct video_buffer_ops name={};struct video_buffer_ops const*_##name(void){}

kos/include/libvideo/gfx/buffer.h

@@ -706,17 +706,6 @@ video_buffer_forbitmask(video_dim_t __size_x, video_dim_t __size_y,
                         video_color_t const __bg_fg_colors[2]);
 #endif /* LIBVIDEO_GFX_WANT_PROTOTYPES */
 
-/* Return the preferred video format.
- * If  possible, this format will match the format used by the host's graphics card.
- * If no graphics card exists, or the card isn't clear on its preferred format, some
- * other, common format will be returned instead. */
-typedef __ATTR_RETNONNULL_T __ATTR_WUNUSED_T struct video_format const *
-(LIBVIDEO_GFX_CC *PVIDEO_PREFERRED_FORMAT)(void);
-#ifdef LIBVIDEO_GFX_WANT_PROTOTYPES
-LIBVIDEO_GFX_DECL __ATTR_RETNONNULL __ATTR_WUNUSED struct video_format const *
-LIBVIDEO_GFX_CC video_preferred_format(void);
-#endif /* LIBVIDEO_GFX_WANT_PROTOTYPES */
-
 #endif /* TODO: END DEPRECATED */
 
 
@@ -885,29 +874,46 @@ video_buffer_region(struct video_buffer *__restrict __self,
 #endif /* LIBVIDEO_GFX_WANT_PROTOTYPES */
 
 
-
-
-/* Return a video buffer that  will always (forcefully) re-return  `__self'
- * whenever a GFX context is requested. Additionally, video locks will fail
- * when pixels represented by `__self'  cannot represented as a video  lock
- * (e.g.  the Clip-  and I/O-Rects don't  match, or the  Clip Rect's bounds
- * don't end up at some whole-byte boundary,  or don't end up aligned to  a
- * degree that is  sufficient for  the codec  of `__self',  or `__self'  is
- * making using of some rotation/mirror GFX flags).
+/* Return a video buffer  that simulates the clipping/rotation  behavior
+ * of the given GFX context `__self'. Other GFX pixel modification flags
+ * that  are unrelated  to rotation/mirroring  are also  retained by the
+ * returned buffer (e.g. VIDEO_GFX_F_BLUR is retained).
+ *
+ * Note that the returned buffer only retains:
+ * - Clip Rect
+ * - I/O Rect
+ * - GFX Flags
  *
- * If you want to guaranty that the returned buffer is still lockable, you
- * should wrap it again using `video_buffer_lockable()'.
+ * It does not retain:
+ * - Blend Mode
+ * - Color Key
  *
- * @return: * :   A video buffer representing the Clip Rect of `__self'
+ * Note that unlike `video_buffer_region()', which still allows for use
+ * of video locks being applied to the returned buffer when rotation is
+ * being used (with those locks then used to access un-rotated pixels),
+ * the  buffer returned by this function REJECTS video locks when pixel
+ * data is transformed in any way that cannot be represented using only
+ * I/O rects. As such, you may need to use `video_buffer_lockable()' on
+ * the returned buffer in order to make it lockable (if you wish to use
+ * pixel data in a rotated/mirrored form).
+ *
+ * NOTE: Revoking pixel access on the returned buffer, or other types
+ *       of buffers derived from it may also revoke pixel access from
+ *       `__self', so use with care.
+ *
+ * @return: * :   A video buffer representing the given `__self'
  * @return: NULL: [errno=ENOMEM] Insufficient memory. */
 typedef __ATTR_WUNUSED_T __ATTR_IN_T(1) __REF struct video_buffer *
-(LIBVIDEO_GFX_CC *POLD_VIDEO_BUFFER_FROMGFX)(struct video_gfx const *__restrict __self);
+(LIBVIDEO_GFX_CC *PVIDEO_BUFFER_FROMGFX)(struct video_gfx const *__restrict __self);
 #ifdef LIBVIDEO_GFX_WANT_PROTOTYPES
 LIBVIDEO_GFX_DECL __ATTR_WUNUSED __ATTR_IN(1) __REF struct video_buffer *LIBVIDEO_GFX_CC
-old_video_buffer_fromgfx(struct video_gfx const *__restrict __self);
+video_buffer_fromgfx(struct video_gfx const *__restrict __self);
 #endif /* LIBVIDEO_GFX_WANT_PROTOTYPES */
 
 
+
+
+
 /* Various functions  for opening  a file/stream/blob  as an  image  file.
  * The actual file format is  auto-detected, and supported formats  depend
  * on installed 3rd party libraries. By default, BMP and PNG is supported. */

kos/include/libvideo/gfx/gfx.h

@@ -40,6 +40,7 @@
 #endif /* __cplusplus */
 
 #ifndef __INTELLISENSE__
+#include "../rect.h"
 #include <libc/string.h>
 #endif /* !__INTELLISENSE__ */
 
@@ -95,7 +96,7 @@ typedef __UINT32_TYPE__ video_gfx_flag_t;
 
 /* Combine pre-existing GFX flags `__old_flags' with `__more_flags' */
 __LOCAL __ATTR_CONST __ATTR_WUNUSED video_gfx_flag_t
-gfx_flag_combine(video_gfx_flag_t __old_flags, video_gfx_flag_t __more_flags) {
+video_gfx_flag_combine(video_gfx_flag_t __old_flags, video_gfx_flag_t __more_flags) {
 	if (__old_flags & VIDEO_GFX_F_XYSWAP) {
 		__more_flags = (__more_flags & ~(_VIDEO_GFX_XFLAGS | _VIDEO_GFX_YFLAGS)) |
 		               ((__more_flags & _VIDEO_GFX_XFLAGS) << _VIDEO_GFX_FLAGS_X_TO_Y_LSHIFT) |
@@ -584,6 +585,9 @@ extern __ATTR_RETNONNULL __ATTR_INOUT(1) struct video_gfx *
 video_gfx_clip(struct video_gfx *__restrict __self,
                video_offset_t __clip_x, video_offset_t __clip_y,
                video_dim_t __size_x, video_dim_t __size_y);
+extern __ATTR_RETNONNULL __ATTR_INOUT(1) __ATTR_IN(2) struct video_gfx *
+video_gfx_cliprect(struct video_gfx *__restrict __self,
+                   struct video_rect const *__restrict __rect);
 
 
 /* Translate virtual (offset) pixel coords to physical (coord) coords.
@@ -755,6 +759,8 @@ video_gfx_stretch3(struct video_gfx const *__wrdst, video_offset_t __wrdst_x, vi
 #define video_gfx_getflags(self)              ((self)->vx_flags)
 #define video_gfx_clip(self, clip_x, clip_y, size_x, size_y) \
 	(*(self)->vx_hdr.vxh_ops->vgfo_clip)(self, clip_x, clip_y, size_x, size_y)
+#define video_gfx_cliprect(self, rect) \
+	video_gfx_clip(self, (rect)->vr_xmin, (rect)->vr_ymin, (rect)->vr_xdim, (rect)->vr_ydim)
 #define video_gfx_offset2coord(self, x, y, coords) \
 	(*(self)->vx_hdr.vxh_ops->vgfo_offset2coord)(self, x, y, coords)
 #define video_gfx_coord2offset(self, x, y, offsets) \

kos/src/libvideo/gfx/buffer/custom.c

@@ -240,7 +240,7 @@ custom_buffer_subregion__subregion(struct video_buffer *__restrict self,
                                    video_gfx_flag_t gfx_flags) {
 	struct custom_buffer_subregion *me = (struct custom_buffer_subregion *)self;
 	return custom_buffer__subregion_impl(me, rect,
-	                                     gfx_flag_combine(me->cbsr_gfx, gfx_flags),
+	                                     video_gfx_flag_combine(me->cbsr_gfx, gfx_flags),
 	                                     me->cbsr_xoff,
 	                                     me->cbsr_yoff);
 }
@@ -508,7 +508,7 @@ INTERN ATTR_RETNONNULL ATTR_INOUT(1) struct video_gfx *FCC
 custom_buffer_subregion__initgfx(struct video_gfx *__restrict self) {
 	struct custom_buffer_subregion *me  = (struct custom_buffer_subregion *)self->vx_buffer;
 	struct gfx_swdrv *drv = video_swgfx_getdrv(self);
-	self->vx_flags = gfx_flag_combine(me->cbsr_gfx, self->vx_flags);
+	self->vx_flags = video_gfx_flag_combine(me->cbsr_gfx, self->vx_flags);
 	libvideo_gfx_init_fullclip(self);
 
 	/* Default pixel accessors */
@@ -523,7 +523,7 @@ custom_buffer_subregion__initgfx(struct video_gfx *__restrict self) {
 INTERN ATTR_RETNONNULL ATTR_INOUT(1) struct video_gfx *FCC
 custom_buffer_subregion_nooff__initgfx(struct video_gfx *__restrict self) {
 	struct custom_buffer_subregion *me = (struct custom_buffer_subregion *)self->vx_buffer;
-	self->vx_flags = gfx_flag_combine(me->cbsr_gfx, self->vx_flags);
+	self->vx_flags = video_gfx_flag_combine(me->cbsr_gfx, self->vx_flags);
 	return custom_buffer__initgfx(self);
 }