Changeset 8821 for trunk/src

Timestamp:

Jul 2, 2002, 11:55:13 AM (23 years ago)

Author:

sandervl

Message:

Removed RGB555->565 conversion in Fill16on16 & SurfReleaseDC (problem located in GDI32)

Location:

trunk/src/ddraw

Files:

• OS2SURFACE.CPP (modified) (2 diffs)
• fillfunc.cpp (modified) (2 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.44 2002-07-01 19:15:24 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.45 2002-07-02 09:55:12 sandervl Exp $ */
 
 /*
@@ -4967 +4967 @@
       GetDIBits(hdc, me->hbmImage, 0, me->DDSurfaceDesc.dwHeight,
                 me->DDSurfaceDesc.lpSurface,(PBITMAPINFO)&BitmapInfo,DIB_RGB_COLORS);
-
-      //GetDIBits returns data in RGB555 format; convert if surface is in RGB565 format
-      if(me->DDSurfaceDesc.ddpfPixelFormat.dwGBitMask == 0x7E0) {
-        int imgsize = BitmapInfo.bmiHead.biWidth*BitmapInfo.bmiHead.biHeight*2;
-
-        if(CPUFeatures & CPUID_MMX) {
-             DDrawRGB555to565MMX((char *)me->DDSurfaceDesc.lpSurface, (char *)me->DDSurfaceDesc.lpSurface, imgsize/sizeof(WORD));
-        }
-        else DDrawRGB555to565((char *)me->DDSurfaceDesc.lpSurface, (char *)me->DDSurfaceDesc.lpSurface, imgsize/sizeof(WORD));
-      }
       break;
 

trunk/src/ddraw/fillfunc.cpp

@@ -1 @@
-/* $Id: fillfunc.cpp,v 1.6 2002-07-01 19:15:26 sandervl Exp $ */
+/* $Id: fillfunc.cpp,v 1.7 2002-07-02 09:55:13 sandervl Exp $ */
 
 /*
@@ -226 +226 @@
   dprintf(("Fill16on16 %x (%d,%d)(%d,%d) %d %x", pDB+(dwTop*dwPitchDB)+(dwLeft*2), dwLeft, dwTop, dwWidth, dwHeight, dwPitchDB, dwColor));
 
-  dwColor = MAKE_RGB565(dwColor);
   dwColor = (dwColor&0xFFFF)+((dwColor&0xFFFF)<<16);