devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

lcd: Refactor viewport clipping functions

Browse source 
There's no need to generate separate copies of these functions
for main and remote LCDs; we can just pass the viewport directly.

Change-Id: I20aa04a58d327b479a942708e161068bd6a3357b
This commit is contained in:
Aidan MacDonald 2022-10-02 00:54:31 +01:00
parent 6acc8a81a7
commit f737e5025d
9 changed files with 47 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

23
firmware/drivers/lcd-bitmap-common.c
View file

@ -58,15 +58,13 @@ extern void viewport_set_buffer(struct viewport *vp,
* In-viewport clipping functions:
*
* These clip a primitive (pixel, line, rect) given in
* viewport-relative coordinates to the current viewport,
* viewport-relative coordinates to the specified viewport,
* and translate it to screen coordinates. They return
* false if the resulting primitive would be off-screen.
*/
static bool LCDFN(clip_viewport_pixel)(int *x, int *y)
static inline bool clip_viewport_pixel(struct viewport *vp, int *x, int *y)
{
struct viewport *vp = LCDFN(current_viewport);
if (*x < 0 || *x >= vp->width ||
*y < 0 || *y >= vp->height)
return false;
@ -76,10 +74,9 @@ static bool LCDFN(clip_viewport_pixel)(int *x, int *y)
return true;
}
static bool LCDFN(clip_viewport_hline)(int *x1, int *x2, int *y)
static inline bool clip_viewport_hline(struct viewport *vp,
int *x1, int *x2, int *y)
{
struct viewport *vp = LCDFN(current_viewport);
if (*y < 0 || *y > vp->height)
return false;
@ -105,10 +102,9 @@ static bool LCDFN(clip_viewport_hline)(int *x1, int *x2, int *y)
return true;
}
static bool LCDFN(clip_viewport_vline)(int *x, int *y1, int *y2)
static inline bool clip_viewport_vline(struct viewport *vp,
int *x, int *y1, int *y2)
{
struct viewport *vp = LCDFN(current_viewport);
if (*x < 0 || *x > vp->width)
return false;
@ -134,11 +130,10 @@ static bool LCDFN(clip_viewport_vline)(int *x, int *y1, int *y2)
return true;
}
static bool LCDFN(clip_viewport_rect)(int *x, int *y, int *width, int *height,
static inline bool clip_viewport_rect(struct viewport *vp,
int *x, int *y, int *width, int *height,
int *src_x, int *src_y)
{
struct viewport *vp = LCDFN(current_viewport);
if (*x < 0) {
*width += *x;
if (src_x)
@ -844,7 +839,7 @@ void LCDFN(nine_segment_bmp)(const struct bitmap* bm, int x, int y,
void LCDFN(drawpixel)(int x, int y)
{
struct viewport *vp = LCDFN(current_viewport);
if (LCDFN(clip_viewport_pixel(&x, &y)))
if (clip_viewport_pixel(vp, &x, &y))
{
#if LCDM(DEPTH) >= 8
LCDFN(fastpixelfunc_type) *pfunc = LCDFN(fastpixelfuncs)[vp->drawmode];