mirrors/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2025-01-23 01:31:51 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the two warnings in video/vid_mga.c.

Browse source
This commit is contained in:
OBattler 2023-12-25 13:10:48 +01:00
parent ce05674b7d
commit aab48daff7
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/video/vid_mga.c
View file

@ -5732,25 +5732,26 @@ static uint32_t
mystique_conv_16to32(svga_t* svga, uint16_t color, uint8_t bpp) mystique_conv_16to32(svga_t* svga, uint16_t color, uint8_t bpp)
{ {
mystique_t *mystique = (mystique_t*)svga->priv; mystique_t *mystique = (mystique_t*)svga->priv;
uint32_t ret = 0x00000000;
if (svga->lut_map) { if (svga->lut_map) {
if (bpp == 15) { if (bpp == 15) {
if (mystique->xgenctrl & (1 << 2)) { if (mystique->xgenctrl & (1 << 2))
color &= 0x7FFF; color &= 0x7FFF;
}
uint8_t b = getcolr(svga->pallook[(color & 0x1F) | (!!(color & 0x8000) >> 8)]); uint8_t b = getcolr(svga->pallook[(color & 0x1F) | (!!(color & 0x8000) >> 8)]);
uint8_t g = getcolg(svga->pallook[((color & 0x3E0) >> 5) | (!!(color & 0x8000) >> 8)]); uint8_t g = getcolg(svga->pallook[((color & 0x3E0) >> 5) | (!!(color & 0x8000) >> 8)]);
uint8_t r = getcolb(svga->pallook[((color & 0x7C00) >> 10) | (!!(color & 0x8000) >> 8)]); uint8_t r = getcolb(svga->pallook[((color & 0x7C00) >> 10) | (!!(color & 0x8000) >> 8)]);
return video_15to32[color] & 0xFF000000 | makecol(r, g, b); ret = (video_15to32[color] & 0xFF000000) | makecol(r, g, b);
} else { } else {
uint8_t b = getcolr(svga->pallook[color & 0x1f]); uint8_t b = getcolr(svga->pallook[color & 0x1f]);
uint8_t g = getcolg(svga->pallook[(color & 0x7e0) >> 5]); uint8_t g = getcolg(svga->pallook[(color & 0x7e0) >> 5]);
uint8_t r = getcolb(svga->pallook[(color & 0xf800) >> 11]); uint8_t r = getcolb(svga->pallook[(color & 0xf800) >> 11]);
return video_16to32[color] & 0xFF000000 | makecol(r, g, b); ret = (video_16to32[color] & 0xFF000000) | makecol(r, g, b);
} }
} } else
ret = (bpp == 15) ? video_15to32[color] : video_16to32[color];
return (bpp == 15) ? video_15to32[color] : video_16to32[color];
return ret;
} }
static void * static void *