Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lcd-bitmap-common optimize a few viewport functions

Browse source 
Change-Id: I71cd61f66e875280d07f17a9e828fbecc305bad2
This commit is contained in:
William Wilgus 2022-03-21 10:00:04 -04:00
parent 64c577a0c5
commit 60e5786b48
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,6 +84,7 @@ struct viewport* LCDFN(init_viewport)(struct viewport* vp)
{
vp = &default_vp;
vp->buffer = fb_default;
return vp;
}
/* use defaults if no buffer is provided */
@ -132,8 +133,9 @@ struct viewport* LCDFN(set_viewport_ex)(struct viewport* vp, int flags)
* expected.
*/
if((unsigned) vp->x > (unsigned) LCDM(WIDTH)
|| (unsigned) vp->y > (unsigned) LCDM(HEIGHT)
if( vp->x < 0 || vp->y < 0
|| vp->x > LCDM(WIDTH)
|| vp->y > LCDM(HEIGHT)
|| vp->x + vp->width > LCDM(WIDTH)
|| vp->y + vp->height > LCDM(HEIGHT))
{
@ -177,12 +179,18 @@ struct viewport *LCDFN(get_viewport)(bool *is_default)
void LCDFN(update_viewport)(void)
{
struct viewport* vp = LCDFN(current_viewport);
int x, y;
if (vp->buffer->stride != LCDFN(framebuffer_default.stride))
{
LCDFN(update_viewport_rect)(0,0, vp->width, vp->height);
return;
x = 0;
y = 0;
}
LCDFN(update_rect)(vp->x, vp->y, vp->width, vp->height);
else
{
x = vp->x;
y = vp->y;
}
LCDFN(update_rect)(x, y, vp->width, vp->height);
}
void LCDFN(update_viewport_rect)(int x, int y, int width, int height)