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

check li.bpp with the requested bpp

Browse Source
This commit is contained in:
Vincent Wei
2019-04-08 13:48:16 +08:00
parent 736a532b1a
commit eca15c447d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/newgal/commlcd/commlcd.c
+11 -7
View File
@@ -193,11 +193,11 @@ VideoBootStrap COMMLCD_bootstrap = {
static int COMMLCD_VideoInit(_THIS, GAL_PixelFormat *vformat)
{
fprintf (stderr, "NEWGAL>COMMLCD: Calling init method!\n");
_ERR_PRINTF ("NEWGAL>COMMLCD: Calling init method!\n");
/* Initialize LCD screen */
if (__mg_commlcd_ops.init ()) {
fprintf (stderr, "NEWGAL>COMMLCD: Couldn't initialize LCD\n");
_ERR_PRINTF ("NEWGAL>COMMLCD: Couldn't initialize LCD\n");
return -1;
}
@@ -214,22 +214,26 @@ static GAL_Surface *COMMLCD_SetVideoMode(_THIS, GAL_Surface *current,
int width, int height, int bpp, Uint32 flags)
{
Uint32 Rmask = 0, Gmask = 0, Bmask = 0, Amask = 0;
struct commlcd_info li;
struct commlcd_info li;
memset (&li, 0, sizeof (struct commlcd_info));
if (__mg_commlcd_ops.getinfo (&li, width, height, bpp)) {
fprintf (stderr, "NEWGAL>COMMLCD: "
_ERR_PRINTF ("NEWGAL>COMMLCD: "
"Couldn't get the LCD information\n");
return NULL;
}
if (li.bpp != bpp) {
_ERR_PRINTF ("NEWGAL>COMMLCD: "
"Returned color depth (%d) does not matched the requested color depth (%d)\n",
li.bpp, bpp);
}
this->hidden->w = li.width;
this->hidden->h = li.height;
this->hidden->pitch = li.pitch;
this->hidden->fb = li.fb;
memset (li.fb, 0, li.pitch * height);
switch (li.type) {
case COMMLCD_PSEUDO_RGB332:
Rmask = 0xE0;
@@ -278,7 +282,7 @@ static GAL_Surface *COMMLCD_SetVideoMode(_THIS, GAL_Surface *current,
__mg_commlcd_ops.release ();
this->hidden->fb = NULL;
fprintf (stderr, "NEWGAL>COMMLCD: "
_ERR_PRINTF ("NEWGAL>COMMLCD: "
"Couldn't allocate new pixel format for requested mode\n");
return NULL;
}