mirror of
https://github.com/lvgl/lvgl.git
synced 2026-05-27 20:57:01 +08:00
fix(SW) build with LV_DRAW_SW_COMPLEX disabled (#8246)
Signed-off-by: Cosmin-Daniel Radu <cosmin.radu_1@nxp.com>
This commit is contained in:
committed by
GitHub
parent
94bdc2daa4
commit
77200ba71a
@@ -306,9 +306,9 @@ static void get_rounded_area(int16_t angle, int32_t radius, uint8_t thickness, l
|
|||||||
|
|
||||||
#else /*LV_DRAW_SW_COMPLEX*/
|
#else /*LV_DRAW_SW_COMPLEX*/
|
||||||
|
|
||||||
void lv_draw_sw_arc(lv_draw_unit_t * draw_unit, const lv_draw_arc_dsc_t * dsc, const lv_area_t * coords)
|
void lv_draw_sw_arc(lv_draw_task_t * t, const lv_draw_arc_dsc_t * dsc, const lv_area_t * coords)
|
||||||
{
|
{
|
||||||
LV_UNUSED(draw_unit);
|
LV_UNUSED(t);
|
||||||
LV_UNUSED(dsc);
|
LV_UNUSED(dsc);
|
||||||
LV_UNUSED(coords);
|
LV_UNUSED(coords);
|
||||||
|
|
||||||
|
|||||||
@@ -283,6 +283,14 @@ void draw_border_complex(lv_draw_task_t * t, const lv_area_t * outer_area, const
|
|||||||
if(rout > 0) lv_draw_sw_mask_free_param(&mask_rout_param);
|
if(rout > 0) lv_draw_sw_mask_free_param(&mask_rout_param);
|
||||||
lv_free(mask_buf);
|
lv_free(mask_buf);
|
||||||
|
|
||||||
|
#else
|
||||||
|
LV_UNUSED(t);
|
||||||
|
LV_UNUSED(outer_area);
|
||||||
|
LV_UNUSED(inner_area);
|
||||||
|
LV_UNUSED(rout);
|
||||||
|
LV_UNUSED(rin);
|
||||||
|
LV_UNUSED(color);
|
||||||
|
LV_UNUSED(opa);
|
||||||
#endif /*LV_DRAW_SW_COMPLEX*/
|
#endif /*LV_DRAW_SW_COMPLEX*/
|
||||||
}
|
}
|
||||||
static void draw_border_simple(lv_draw_task_t * t, const lv_area_t * outer_area, const lv_area_t * inner_area,
|
static void draw_border_simple(lv_draw_task_t * t, const lv_area_t * outer_area, const lv_area_t * inner_area,
|
||||||
|
|||||||
@@ -732,9 +732,9 @@ static void LV_ATTRIBUTE_FAST_MEM shadow_blur_corner(int32_t size, int32_t sw, u
|
|||||||
|
|
||||||
#else /*LV_DRAW_SW_COMPLEX*/
|
#else /*LV_DRAW_SW_COMPLEX*/
|
||||||
|
|
||||||
void lv_draw_sw_box_shadow(lv_draw_unit_t * draw_unit, const lv_draw_box_shadow_dsc_t * dsc, const lv_area_t * coords)
|
void lv_draw_sw_box_shadow(lv_draw_task_t * t, const lv_draw_box_shadow_dsc_t * dsc, const lv_area_t * coords)
|
||||||
{
|
{
|
||||||
LV_UNUSED(draw_unit);
|
LV_UNUSED(t);
|
||||||
LV_UNUSED(dsc);
|
LV_UNUSED(dsc);
|
||||||
LV_UNUSED(coords);
|
LV_UNUSED(coords);
|
||||||
|
|
||||||
|
|||||||
@@ -64,9 +64,11 @@ static void img_draw_core(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_d
|
|||||||
const lv_area_t * img_coords, const lv_area_t * clipped_img_area);
|
const lv_area_t * img_coords, const lv_area_t * clipped_img_area);
|
||||||
|
|
||||||
|
|
||||||
|
#if LV_DRAW_SW_COMPLEX
|
||||||
static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
||||||
const lv_image_decoder_dsc_t * decoder_dsc,
|
const lv_image_decoder_dsc_t * decoder_dsc,
|
||||||
const lv_area_t * img_coords, const lv_area_t * clipped_img_area);
|
const lv_area_t * img_coords, const lv_area_t * clipped_img_area);
|
||||||
|
#endif /*LV_DRAW_SW_COMPLEX*/
|
||||||
|
|
||||||
static void recolor_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
static void recolor_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
||||||
const lv_image_decoder_dsc_t * decoder_dsc,
|
const lv_image_decoder_dsc_t * decoder_dsc,
|
||||||
@@ -279,10 +281,12 @@ static void img_draw_core(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_d
|
|||||||
else if(!transformed && !radius && draw_dsc->recolor_opa > LV_OPA_MIN) {
|
else if(!transformed && !radius && draw_dsc->recolor_opa > LV_OPA_MIN) {
|
||||||
recolor_only(t, draw_dsc, decoder_dsc, img_coords, clipped_img_area);
|
recolor_only(t, draw_dsc, decoder_dsc, img_coords, clipped_img_area);
|
||||||
}
|
}
|
||||||
|
#if LV_DRAW_SW_COMPLEX
|
||||||
/*Handle masked RGB565, RGB888, XRGB888, or ARGB8888 images*/
|
/*Handle masked RGB565, RGB888, XRGB888, or ARGB8888 images*/
|
||||||
else if(!transformed && radius && draw_dsc->recolor_opa <= LV_OPA_MIN) {
|
else if(!transformed && radius && draw_dsc->recolor_opa <= LV_OPA_MIN) {
|
||||||
radius_only(t, draw_dsc, decoder_dsc, img_coords, clipped_img_area);
|
radius_only(t, draw_dsc, decoder_dsc, img_coords, clipped_img_area);
|
||||||
}
|
}
|
||||||
|
#endif /*LV_DRAW_SW_COMPLEX*/
|
||||||
/* check whether it is possible to accelerate the operation in synchronous mode */
|
/* check whether it is possible to accelerate the operation in synchronous mode */
|
||||||
else if(LV_RESULT_INVALID == LV_DRAW_SW_IMAGE(transformed, /* whether require transform */
|
else if(LV_RESULT_INVALID == LV_DRAW_SW_IMAGE(transformed, /* whether require transform */
|
||||||
cf, /* image format */
|
cf, /* image format */
|
||||||
@@ -297,6 +301,7 @@ static void img_draw_core(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_d
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if LV_DRAW_SW_COMPLEX
|
||||||
static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
||||||
const lv_image_decoder_dsc_t * decoder_dsc,
|
const lv_image_decoder_dsc_t * decoder_dsc,
|
||||||
const lv_area_t * img_coords, const lv_area_t * clipped_img_area)
|
const lv_area_t * img_coords, const lv_area_t * clipped_img_area)
|
||||||
@@ -376,6 +381,7 @@ static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc
|
|||||||
lv_free(mask_buf);
|
lv_free(mask_buf);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#endif /*LV_DRAW_SW_COMPLEX*/
|
||||||
static void recolor_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
static void recolor_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
|
||||||
const lv_image_decoder_dsc_t * decoder_dsc,
|
const lv_image_decoder_dsc_t * decoder_dsc,
|
||||||
const lv_area_t * img_coords, const lv_area_t * clipped_img_area)
|
const lv_area_t * img_coords, const lv_area_t * clipped_img_area)
|
||||||
|
|||||||
@@ -399,7 +399,7 @@ static void LV_ATTRIBUTE_FAST_MEM draw_line_skew(lv_draw_task_t * t, const lv_dr
|
|||||||
lv_draw_sw_mask_free_param(&mask_bottom_param);
|
lv_draw_sw_mask_free_param(&mask_bottom_param);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
LV_UNUSED(draw_unit);
|
LV_UNUSED(t);
|
||||||
LV_UNUSED(dsc);
|
LV_UNUSED(dsc);
|
||||||
LV_LOG_WARN("Can't draw skewed line with LV_DRAW_SW_COMPLEX == 0");
|
LV_LOG_WARN("Can't draw skewed line with LV_DRAW_SW_COMPLEX == 0");
|
||||||
#endif /*LV_DRAW_SW_COMPLEX*/
|
#endif /*LV_DRAW_SW_COMPLEX*/
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ void lv_draw_sw_triangle(lv_draw_task_t * t, const lv_draw_triangle_dsc_t * dsc)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
LV_UNUSED(draw_unit);
|
LV_UNUSED(t);
|
||||||
LV_UNUSED(dsc);
|
LV_UNUSED(dsc);
|
||||||
LV_LOG_WARN("Can't draw triangles with LV_DRAW_SW_COMPLEX == 0");
|
LV_LOG_WARN("Can't draw triangles with LV_DRAW_SW_COMPLEX == 0");
|
||||||
#endif /*LV_DRAW_SW_COMPLEX*/
|
#endif /*LV_DRAW_SW_COMPLEX*/
|
||||||
|
|||||||
Reference in New Issue
Block a user