Changeset 587 for trunk/src/ddraw/OS2DDRAW.CPP

Timestamp:

Aug 19, 1999, 8:08:48 PM (26 years ago)

Author:

hugh

Message:

Implemented new colorconversion routine and fixed bug in fastblt function.
Changed the palettehandling code

File:

• trunk/src/ddraw/OS2DDRAW.CPP (modified) (7 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -26 +26 @@
 #define KEY_DIRECT2DRAW "\\Software\\Win32OS2\\Direct2\\Draw"
 
-FOURCC  SupportedFourCCs[] = {FOURCC_LUT8,FOURCC_R565,FOURCC_RGB3,FOURCC_RGB4};
+FOURCC  SupportedFourCCs[] = {FOURCC_SCRN,FOURCC_LUT8,FOURCC_R565,FOURCC_RGB3,FOURCC_RGB4};
 //******************************************************************************
 //******************************************************************************
@@ -32 +32 @@
      Referenced(0), lastError(DD_OK),
      pFrameBuffer(NULL), hwndClient(0), screenwidth(640),
-     screenheight(480), screenbpp(8),PrimaryExists(FALSE)
+     screenheight(480), screenbpp(8),PrimaryExists(FALSE),pPrimSurf(NULL)
 
 {
@@ -337 +337 @@
     #endif
 
-    newpal = new OS2IDirectDrawPalette(me, palsize, lpColorTable, dwFlags);
+    newpal = new OS2IDirectDrawPalette((VOID*)me, palsize, lpColorTable, dwFlags);
 
     if(newpal == NULL)
@@ -754 +754 @@
 {
   #ifdef DEBUG
-    WriteLog("GetCaps\n");
+    WriteLog("DDGetCaps of ");
   #endif
 
@@ -764 +764 @@
     // Caller want Driver Caps
 
+    WriteLog("Driver\n");
+
     if(sizeof(DDCAPS)!=lpDDDriverCaps->dwSize)
+    {
+      WriteLog("Size Not Set\n");
       return(DDERR_INVALIDPARAMS);
-
+    }
     // Clear structure so we only have to set the supported flags
 
@@ -777 +781 @@
 
     // Now report the CAPs back which we support
-   lpDDDriverCaps->dwCaps = DDCAPS_BLT |              // We do blitting
-                            DDCAPS_BLTCOLORFILL |     // We do colorfills
-                            DDCAPS_COLORKEY |         // We support Colorkeying
-                            DDCAPS_COLORKEYHWASSIST | // But we (may) use the CPU
-                            DDCAPS_GDI |              // Maybe check if we are on Voodoo ?
-                            DDCAPS_PALETTEVSYNC;      // Got VSync
+    lpDDDriverCaps->dwCaps = DDCAPS_BLT |              // We do blitting
+                             DDCAPS_BLTCOLORFILL |     // We do colorfills
+                             DDCAPS_COLORKEY |         // We support Colorkeying
+                             DDCAPS_COLORKEYHWASSIST | // But we (may) use the CPU
+                             DDCAPS_GDI |              // Maybe check if we are on Voodoo ?
+                             DDCAPS_PALETTEVSYNC;      // Got VSync
 
     lpDDDriverCaps->dwCaps2 = DDCAPS2_CERTIFIED |         // Who cares so say yes
@@ -843 +847 @@
   if(NULL!=lpDDHELCaps)
   {
-    // Caler wants HEL Caps
+    // Caller wants HEL Caps
+    WriteLog(" HEL\n");
+
     if(sizeof(DDCAPS)!=lpDDHELCaps->dwSize)
+    {
+      WriteLog("Size Not Set\n");
       return(DDERR_INVALIDPARAMS);
+    }
+    // Clear structure so we only have to set the supported flags
+
+
+    memset(lpDDHELCaps,0,sizeof(DDCAPS));
+
+
+    // Reset the size
+    lpDDHELCaps->dwSize = sizeof(DDCAPS);
+
+    // Now report the CAPs back which we support
+    lpDDHELCaps->dwCaps = DDCAPS_BLT |              // We do blitting
+                             DDCAPS_BLTCOLORFILL |     // We do colorfills
+                             DDCAPS_COLORKEY |         // We support Colorkeying
+                             DDCAPS_COLORKEYHWASSIST | // But we (may) use the CPU
+                             DDCAPS_GDI |              // Maybe check if we are on Voodoo ?
+                             DDCAPS_PALETTEVSYNC;      // Got VSync
+
+    lpDDHELCaps->dwCaps2 = DDCAPS2_CERTIFIED |         // Who cares so say yes
+                              DDCAPS2_CANRENDERWINDOWED | // Better check for Voodoo ?!
+                              DDCAPS2_COPYFOURCC |        // yepp memcpy will do this
+                              DDCAPS2_NONLOCALVIDMEM |    // All surfaces are in memory
+                              DDCAPS2_WIDESURFACES;       // Any size you want!
+
+    lpDDHELCaps->dwCKeyCaps = DDCKEYCAPS_SRCBLT;      // Only source transparent blitting
+
+//    lpDDDriverCaps->dwFXCaps = DDFXCAPS_BLTMIRRORUPDOWN; // DIVE supports this, do we also ?
+                                                         // Maybe later add stretching support?
+
+    lpDDHELCaps->dwPalCaps = DDPCAPS_8BIT |          // Only 8 Bits pals
+                                DDPCAPS_ALLOW256 |      // But all 256 colors
+                                DDPCAPS_VSYNC  |        // Vsync yet
+                                DDPCAPS_PRIMARYSURFACE; //
+    lpDDHELCaps->dwVidMemTotal = 2048*1024;           // total video memory
+    lpDDHELCaps->dwVidMemFree  = 2048*1024;            // total free video memory
+    lpDDHELCaps->dwNumFourCCCodes;        // number of supported FOURCC codes
+    lpDDHELCaps->dwRops[DD_ROP_SPACE];    // supported raster ops
+    lpDDHELCaps->dwSVBCaps = DDCAPS_BLT |              // We do blitting
+                                DDCAPS_BLTCOLORFILL |     // We do colorfills
+                                DDCAPS_COLORKEY |         // We support Colorkeying
+                                DDCAPS_COLORKEYHWASSIST;
+    lpDDHELCaps->dwSVBCKeyCaps = DDCKEYCAPS_SRCBLT;      // Only source transparent blitting
+    lpDDHELCaps->dwSVBFXCaps;             //  .
+    lpDDHELCaps->dwSVBRops[DD_ROP_SPACE]; //  .
+    lpDDHELCaps->dwVSBCaps = DDCAPS_BLT |              // We do blitting
+                                DDCAPS_BLTCOLORFILL |     // We do colorfills
+                                DDCAPS_COLORKEY |         // We support Colorkeying
+                                DDCAPS_COLORKEYHWASSIST;
+    lpDDHELCaps->dwVSBCKeyCaps = DDCKEYCAPS_SRCBLT;      // Only source transparent blitting
+    lpDDHELCaps->dwVSBFXCaps;             //  .
+    lpDDHELCaps->dwVSBRops[DD_ROP_SPACE]; //  .
+    lpDDHELCaps->dwSSBCaps = DDCAPS_BLT |              // We do blitting
+                                DDCAPS_BLTCOLORFILL |     // We do colorfills
+                                DDCAPS_COLORKEY |         // We support Colorkeying
+                                DDCAPS_COLORKEYHWASSIST;
+    lpDDHELCaps->dwSSBCKeyCaps = DDCKEYCAPS_SRCBLT;      // Only source transparent blitting
+    lpDDHELCaps->dwSSBFXCaps;            //  .
+    lpDDHELCaps->dwSSBRops[DD_ROP_SPACE]; //  .
+    lpDDHELCaps->dwSVBCaps2 = DDCAPS2_CANRENDERWINDOWED | // Better check for Voodoo ?!
+                                 DDCAPS2_COPYFOURCC |        // yepp memcpy will do this
+                                 DDCAPS2_WIDESURFACES;       // Any size you want!
+    lpDDHELCaps->dwNLVBCaps = DDCAPS_BLT |              // We do blitting
+                                 DDCAPS_BLTCOLORFILL |     // We do colorfills
+                                 DDCAPS_COLORKEY |         // We support Colorkeying
+                                 DDCAPS_COLORKEYHWASSIST;
+    lpDDHELCaps->dwNLVBCaps2 = DDCAPS2_CANRENDERWINDOWED | // Better check for Voodoo ?!
+                                  DDCAPS2_COPYFOURCC |        // yepp memcpy will do this
+                                  DDCAPS2_WIDESURFACES;       // Any size you want!
+    lpDDHELCaps->dwNLVBCKeyCaps = DDCKEYCAPS_SRCBLT;      // Only source transparent blitting
+    lpDDHELCaps->dwNLVBFXCaps;            //  .
+    lpDDHELCaps->dwNLVBRops[DD_ROP_SPACE];//  .
 
   }