Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-23 08:33:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

implementation StretchBltEx; check validation of color blending method

Browse Source
This commit is contained in:
Vincent Wei
2021-05-04 15:57:27 +08:00
parent 77bb2f4433
commit 7364a960bc
4 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/newgal.h
+1 -1
View File
@@ -934,7 +934,7 @@ GAL_Surface * GAL_DisplayFormat (GAL_Surface *surface);
GAL_Surface * GAL_DisplayFormatAlpha (GAL_Surface *surface);
int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect, DWORD op);
GAL_Surface *dst, GAL_Rect *dstrect, int rotation, DWORD op);
#ifdef _MGSCHEMA_COMPOSITING
extern GAL_Surface* __gal_screen;
src/newgal/blit.c
+4
View File
@@ -465,6 +465,10 @@ static int GAL_PixmanBlit (struct GAL_Surface *src, GAL_Rect *srcrect,
op = src->map->cop & ~COLOR_BLEND_FLAGS_MASK;
}
if (op > PIXMAN_OP_HSL_LUMINOSITY || op < PIXMAN_OP_CLEAR) {
op = PIXMAN_OP_SRC;
}
src_img = pixman_image_create_bits_no_clear ((pixman_format_code_t)src->tmp_data,
src->w, src->h,
(uint32_t *)((char*)src->pixels + src->pixels_off),
src/newgal/stretch.c
+31 -17
View File
@@ -404,12 +404,14 @@ static int GAL_StretchBltLegacy (GAL_Surface *src, GAL_Rect *srcrect,
#include <math.h>
int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect, DWORD cop)
GAL_Surface *dst, GAL_Rect *dstrect, int rotation, DWORD ops)
{
pixman_image_t *src_img = NULL, *dst_img = NULL, *msk_img = NULL;
pixman_op_t op;
uint32_t alpha_bits;
int retv = -1;
DWORD cop = ops & ~COLOR_BLEND_FLAGS_MASK;
DWORD filter = ops >> SCALING_FILTER_SHIFT;
if (!GAL_CheckPixmanFormat (src, dst) || (src->flags & GAL_SRCCOLORKEY))
return GAL_StretchBltLegacy (src, srcrect, dst, dstrect, cop);
@@ -436,6 +438,10 @@ int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
op = cop & ~COLOR_BLEND_FLAGS_MASK;
}
if (op > PIXMAN_OP_HSL_LUMINOSITY || op < PIXMAN_OP_CLEAR) {
op = PIXMAN_OP_SRC;
}
src_img = pixman_image_create_bits_no_clear ((pixman_format_code_t)src->tmp_data,
src->w, src->h,
(uint32_t *)((char*)src->pixels + src->pixels_off),
@@ -458,13 +464,12 @@ int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
{
double fscale_x = srcrect->w * 1.0 / dstrect->w;
double fscale_y = srcrect->h * 1.0 / dstrect->h;
double frotation;
pixman_f_transform_t ftransform;
pixman_transform_t transform;
pixman_fixed_t *params;
int n_params;
pixman_region32_t clip_region;
_DBG_PRINTF ("srcrect: %d, %d, %dx%d; dstrect: %d, %d, %dx%d; scale: %f x %f; cliprect: %d, %d, %dx%d\n",
_WRN_PRINTF ("srcrect: %d, %d, %dx%d; dstrect: %d, %d, %dx%d; scale: %f x %f; cliprect: %d, %d, %dx%d\n",
srcrect->x, srcrect->y, srcrect->w, srcrect->h,
dstrect->x, dstrect->y, dstrect->w, dstrect->h,
1.0/fscale_x, 1.0/fscale_y,
@@ -473,22 +478,31 @@ int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
pixman_f_transform_init_identity (&ftransform);
pixman_f_transform_translate (&ftransform, NULL, -dstrect->x, -dstrect->y);
pixman_f_transform_scale (&ftransform, NULL, fscale_x, fscale_y);
frotation = (rotation / 3600.0) * 2 * M_PI;
pixman_f_transform_rotate (&ftransform, NULL, cos (frotation), sin (frotation));
pixman_f_transform_translate (&ftransform, NULL, srcrect->x, srcrect->y);
//pixman_f_transform_invert (&ftransform, &ftransform);
pixman_transform_from_pixman_f_transform (&transform, &ftransform);
pixman_image_set_transform (src_img, &transform);
//fscale_x = hypot (ftransform.m[0][0], ftransform.m[0][1]) / ftransform.m[2][2];
//fscale_y = hypot (ftransform.m[1][0], ftransform.m[1][1]) / ftransform.m[2][2];
params = pixman_filter_create_separable_convolution (
&n_params,
pixman_double_to_fixed (fscale_x),
pixman_double_to_fixed (fscale_y),
PIXMAN_KERNEL_IMPULSE, PIXMAN_KERNEL_IMPULSE,
PIXMAN_KERNEL_BOX, PIXMAN_KERNEL_BOX,
4, 4);
pixman_image_set_filter (src_img, PIXMAN_FILTER_SEPARABLE_CONVOLUTION, params, n_params);
free (params);
fscale_x = hypot (ftransform.m[0][0], ftransform.m[0][1]) / ftransform.m[2][2];
fscale_y = hypot (ftransform.m[1][0], ftransform.m[1][1]) / ftransform.m[2][2];
if (filter > PIXMAN_FILTER_CONVOLUTION) {
pixman_fixed_t *params;
int n_params;
params = pixman_filter_create_separable_convolution (
&n_params,
pixman_double_to_fixed (fscale_x),
pixman_double_to_fixed (fscale_y),
PIXMAN_KERNEL_IMPULSE, PIXMAN_KERNEL_IMPULSE,
PIXMAN_KERNEL_BOX, PIXMAN_KERNEL_BOX,
4, 4);
pixman_image_set_filter (src_img, PIXMAN_FILTER_SEPARABLE_CONVOLUTION, params, n_params);
free (params);
}
else {
pixman_image_set_filter (src_img, (pixman_filter_t)filter, NULL, 0);
}
pixman_region32_init_rect (&clip_region,
dst->clip_rect.x, dst->clip_rect.y, dst->clip_rect.w, dst->clip_rect.h);
@@ -520,9 +534,9 @@ out:
#else /* defined _MGUSE_PIXMAN */
int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect, DWORD op)
GAL_Surface *dst, GAL_Rect *dstrect, int /*rotation*/, DWORD ops)
{
return GAL_StretchBltLegacy (src, srcrect, dst, dstrect, op);
return GAL_StretchBltLegacy (src, srcrect, dst, dstrect, ops);
}
#endif /* not defined _MGUSE_PIXMAN */
src/newgdi/bitmap.c
+8 -4
View File
@@ -1475,18 +1475,19 @@ error_ret:
UNLOCK_GCRINFO (pddc);
}
void GUIAPI StretchBlt (HDC hsdc, int sx, int sy, int sw, int sh,
HDC hddc, int dx, int dy, int dw, int dh, DWORD dwRop)
BOOL GUIAPI StretchBltEx (HDC hsdc, int sx, int sy, int sw, int sh,
HDC hddc, int dx, int dy, int dw, int dh, int rotation, DWORD dwRop)
{
PDC psdc, pddc;
RECT srcOutput, dstOutput;
PCLIPRECT cliprect;
GAL_Rect src, dst;
RECT eff_rc;
BOOL retv = FALSE;
psdc = dc_HDC2PDC (hsdc);
if (!(pddc = __mg_check_ecrgn (hddc)))
return;
return retv;
// Transfer logical to device to screen here.
sw += sx; sh += sy;
@@ -1520,6 +1521,7 @@ void GUIAPI StretchBlt (HDC hsdc, int sx, int sy, int sw, int sh,
if (dy >= RECTH(pddc->DevRC))
goto error_ret;
retv = TRUE;
if (pddc->surface == psdc->surface)
GetBoundRect (&pddc->rc_output, &srcOutput, &dstOutput);
else
@@ -1539,7 +1541,8 @@ void GUIAPI StretchBlt (HDC hsdc, int sx, int sy, int sw, int sh,
while(cliprect) {
if (IntersectRect (&eff_rc, &pddc->rc_output, &cliprect->rc)) {
SET_GAL_CLIPRECT (pddc, eff_rc);
GAL_StretchBlt (psdc->surface, &src, pddc->surface, &dst, dwRop);
GAL_StretchBlt (psdc->surface, &src, pddc->surface, &dst,
rotation, dwRop);
}
cliprect = cliprect->next;
@@ -1552,6 +1555,7 @@ void GUIAPI StretchBlt (HDC hsdc, int sx, int sy, int sw, int sh,
error_ret:
UNLOCK_GCRINFO (pddc);
return retv;
}
/*