falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

console: Clean up bytes per pixel calculation 

Division with round up is the correct way to compute this even if the
only case where division with round down gives incorrect result is
probably 15 bpp. This case was explicitely patched up in one of these
functions but was unhandled in the other. (I'm not sure about setting
16 bpp for the 15bpp case either but I left that there for now.)

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
(cherry picked from commit feadf1a4de)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
BALATON Zoltan 2012-08-22 17:19:42 +02:00 committed by Michael Roth
parent a0d718a395
commit c6553fee81
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
console.c
View File

@ -1611,7 +1611,7 @@ PixelFormat qemu_different_endianness_pixelformat(int bpp)
memset(&pf, 0x00, sizeof(PixelFormat)); memset(&pf, 0x00, sizeof(PixelFormat));
pf.bits_per_pixel = bpp; pf.bits_per_pixel = bpp;
pf.bytes_per_pixel = bpp / 8; pf.bytes_per_pixel = DIV_ROUND_UP(bpp, 8);
pf.depth = bpp == 32 ? 24 : bpp; pf.depth = bpp == 32 ? 24 : bpp;
switch (bpp) { switch (bpp) {
@ -1660,13 +1660,12 @@ PixelFormat qemu_default_pixelformat(int bpp)
memset(&pf, 0x00, sizeof(PixelFormat)); memset(&pf, 0x00, sizeof(PixelFormat));
pf.bits_per_pixel = bpp; pf.bits_per_pixel = bpp;
pf.bytes_per_pixel = bpp / 8; pf.bytes_per_pixel = DIV_ROUND_UP(bpp, 8);
pf.depth = bpp == 32 ? 24 : bpp; pf.depth = bpp == 32 ? 24 : bpp;
switch (bpp) { switch (bpp) {
case 15: case 15:
pf.bits_per_pixel = 16; pf.bits_per_pixel = 16;
pf.bytes_per_pixel = 2;
pf.rmask = 0x00007c00; pf.rmask = 0x00007c00;
pf.gmask = 0x000003E0; pf.gmask = 0x000003E0;
pf.bmask = 0x0000001F; pf.bmask = 0x0000001F;