Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 10:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix StretchBlt ugliness in qemu. Patch by grschneider.

Browse source 
svn path=/trunk/; revision=35699
This commit is contained in:
Jeffrey Morlan 2008-08-27 14:47:49 +00:00
parent 57164f6854
commit 0346f58af5
1 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
reactos/subsystems/win32/win32k/dib/dib16bpp.c
View file

@ -466,18 +466,6 @@ typedef unsigned short PIXEL;
/* 16-bit HiColor (565 format) */ /* 16-bit HiColor (565 format) */
__inline PIXEL average16(PIXEL a, PIXEL b) __inline PIXEL average16(PIXEL a, PIXEL b)
{ {
// This one doesn't work
/*
if (a == b)
{
return a;
}
else
{
unsigned short mask = ~ (((a | b) & 0x0410) << 1);
return ((a & mask) + (b & mask)) >> 1;
}*/ /* if */
// This one should be correct, but it's too long // This one should be correct, but it's too long
/* /*
unsigned char r1, g1, b1, r2, g2, b2, rr, gr, br; unsigned char r1, g1, b1, r2, g2, b2, rr, gr, br;
@ -499,8 +487,11 @@ __inline PIXEL average16(PIXEL a, PIXEL b)
return res; return res;
*/ */
// This one is the short form of the correct one ;-) // This one is the short form of the correct one, but does not work for QEMU (expects 555 format)
return (((a ^ b) & 0xf7deU) >> 1) + (a & b); //return (((a ^ b) & 0xf7deU) >> 1) + (a & b);
//hack until short version works properly
return a;
} }
//NOTE: If you change something here, please do the same in other dibXXbpp.c files! //NOTE: If you change something here, please do the same in other dibXXbpp.c files!