Changeset 5392 for trunk/src

Timestamp:

Mar 28, 2001, 6:21:06 PM (24 years ago)

Author:

sandervl

Message:

FOURCC checking during surface creation

Location:

trunk/src/ddraw

Files:

• OS2DDRAW.CPP (modified) (2 diffs)
• OS2SURFACE.CPP (modified) (2 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -1 @@
-/* $Id: OS2DDRAW.CPP,v 1.26 2001-03-18 21:44:42 mike Exp $ */
+/* $Id: OS2DDRAW.CPP,v 1.27 2001-03-28 16:21:06 sandervl Exp $ */
 
 /*
@@ -492 +492 @@
     if(rc != DD_OK)
     {
-      dprintf(("DDRAW: Error createing Surface\n\n"));
+      dprintf(("DDRAW: Error createing Surface rc = %d\n\n", rc));
       *lplpDD = NULL;
       delete newsurf;

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.29 2001-03-18 21:44:43 mike Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.30 2001-03-28 16:21:06 sandervl Exp $ */
 
 /*
@@ -1089 +1089 @@
           if(DDSurfaceDesc.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)
             dwBpp = 8;
+          else
           if(DDSurfaceDesc.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED4)
             dwBpp = 4;
+          else
+          if(DDSurfaceDesc.ddpfPixelFormat.dwFlags & DDPF_FOURCC) {
+               dprintf(("DDRAW:  Pixelformat FOURCC %4s", &DDSurfaceDesc.ddpfPixelFormat.dwFourCC));
+               switch(DDSurfaceDesc.ddpfPixelFormat.dwFourCC) {
+               case FOURCC_RGB3:
+                   dwBpp = 24;
+                   break;
+               case FOURCC_RGB4:
+                   dwBpp = 32;
+                   break;
+               default:
+                   dprintf(("DDRAW: Unsupported FOURCC!"));
+                   lastError = DDERR_UNSUPPORTEDFORMAT;
+                   return;
+               }
+          }
         }
       }