Changeset 2614 for trunk/src/gdi32/blit.cpp

Timestamp:

Feb 3, 2000, 7:59:36 PM (26 years ago)

Author:

sandervl

Message:

Added MMX rgb conversion function

File:

• trunk/src/gdi32/blit.cpp (modified) (5 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.3 2000-02-03 10:23:24 dengert Exp $ */
+/* $Id: blit.cpp,v 1.4 2000-02-03 18:59:04 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #include <stdarg.h>
 #include <string.h>
+#include <cpuhlp.h>
 #include "misc.h"
 #include "dibsect.h"
+#include "rgbcvt.h"
 
 static ULONG QueryPaletteSize(BITMAPINFOHEADER *pBHdr);
@@ -86 +88 @@
     INT result, imgsize, palsize, height, width;
     char *ptr;
-    ULONG compression = 0;
+    ULONG compression = 0, iHeight;
     WORD *newbits = 0;
 
@@ -135 +137 @@
         ((BITMAPINFO *)info)->bmiHeader.biCompression = 0;
         compression = BI_BITFIELDS;
-        if(*(bitfields+1) == 0x3E0) {//RGB 555?
-            extern void _Optlink RGB555to565 (WORD *dest, WORD *src, ULONG num);
-
+        if(*(bitfields+1) == 0x3E0) 
+        {//RGB 555?
                 newbits = (WORD *)malloc(imgsize);
-                RGB555to565 (newbits, (WORD *)bits, imgsize/sizeof(WORD));
+                if(CPUFeatures & CPUID_MMX) {
+                        RGB555to565MMX(newbits, (WORD *)bits, imgsize/sizeof(WORD));
+                }
+                else    RGB555to565(newbits, (WORD *)bits, imgsize/sizeof(WORD));
                 bits = newbits;
         }
     }
 
-    if(info->bmiHeader.biHeight < 0)
+    iHeight = info->bmiHeader.biHeight;
+    if(info->bmiHeader.biHeight < 0) {
         ((BITMAPINFO *)info)->bmiHeader.biHeight = -info->bmiHeader.biHeight;
-
+    }
     result = O32_SetDIBitsToDevice(hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (PVOID) bits, (PBITMAPINFO)info, coloruse);
     //SvL: Wrong Open32 return value
@@ -159 +164 @@
         if(newbits) free(newbits);
     }
+    ((BITMAPINFO *)info)->bmiHeader.biHeight = iHeight;
     return result;