Changeset 24646 in vbox for trunk/include/VBox

Timestamp:

Nov 13, 2009 4:47:47 PM (15 years ago)

Author:

vboxsync

Message:

2d accel:

1. performmance: avoid separate drawing of primary surface texture
2. profiling: fps counter
3. saved state restore fix
4. make vhwa command constants values match ddraw contstants
5. guest driver: set proper ddRVal in DdUnlock
6. guest driver: return proper value in DdDestroySurface

File:

• trunk/include/VBox/VBoxVideo.h (modified) (3 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -261 +261 @@
 #define VBOXVHWA_VERSION_MAJ 0
 #define VBOXVHWA_VERSION_MIN 0
-#define VBOXVHWA_VERSION_BLD 3
+#define VBOXVHWA_VERSION_BLD 5
 #define VBOXVHWA_VERSION_RSV 0
 
@@ -418 +418 @@
 } VBOXVHWA_OVERLAYFX;
 
-#define VBOXVHWA_CAPS_BLT             0x00000001
-#define VBOXVHWA_CAPS_BLTCOLORFILL    0x00000002
-#define VBOXVHWA_CAPS_BLTFOURCC       0x00000004
-#define VBOXVHWA_CAPS_BLTSTRETCH      0x00000008
-#define VBOXVHWA_CAPS_BLTQUEUE        0x00000010
-
-#define VBOXVHWA_CAPS_OVERLAY         0x00000100
-#define VBOXVHWA_CAPS_OVERLAYFOURCC   0x00000200
-#define VBOXVHWA_CAPS_OVERLAYSTRETCH  0x00000400
-#define VBOXVHWA_CAPS_OVERLAYCANTCLIP 0x00000800
-
-#define VBOXVHWA_CAPS_COLORKEY        0x00010000
-#define VBOXVHWA_CAPS_COLORKEYHWASSIST         0x00020000
-
-
-#define VBOXVHWA_SCAPS_FLIP             0x00000001
-#define VBOXVHWA_SCAPS_PRIMARYSURFACE   0x00000002
-#define VBOXVHWA_SCAPS_OFFSCREENPLAIN   0x00000004
-#define VBOXVHWA_SCAPS_OVERLAY          0x00000008
-#define VBOXVHWA_SCAPS_VISIBLE          0x00000010
-#define VBOXVHWA_SCAPS_VIDEOMEMORY      0x00000020
-#define VBOXVHWA_SCAPS_LOCALVIDMEM      0x00000040
-#define VBOXVHWA_SCAPS_COMPLEX          0x00000080
-
-
-#define VBOXVHWA_PF_RGB                 0x00000001
-#define VBOXVHWA_PF_RGBTOYUV            0x00000002
-#define VBOXVHWA_PF_YUV                 0x00000008
-#define VBOXVHWA_PF_FOURCC              0x00000010
-
-#define VBOXVHWA_LOCK_DISCARDCONTENTS   0x00000001
+#define VBOXVHWA_CAPS_BLT               0x00000040
+#define VBOXVHWA_CAPS_BLTCOLORFILL      0x04000000
+#define VBOXVHWA_CAPS_BLTFOURCC         0x00000100
+#define VBOXVHWA_CAPS_BLTSTRETCH        0x00000200
+#define VBOXVHWA_CAPS_BLTQUEUE          0x00000080
+
+#define VBOXVHWA_CAPS_OVERLAY           0x00000800
+#define VBOXVHWA_CAPS_OVERLAYFOURCC     0x00002000
+#define VBOXVHWA_CAPS_OVERLAYSTRETCH    0x00004000
+#define VBOXVHWA_CAPS_OVERLAYCANTCLIP   0x00001000
+
+#define VBOXVHWA_CAPS_COLORKEY          0x00400000
+#define VBOXVHWA_CAPS_COLORKEYHWASSIST  0x01000000
+
+#define VBOXVHWA_SCAPS_BACKBUFFER       0x00000004
+#define VBOXVHWA_SCAPS_COMPLEX          0x00000008
+#define VBOXVHWA_SCAPS_FLIP             0x00000010
+#define VBOXVHWA_SCAPS_FRONTBUFFER      0x00000020
+#define VBOXVHWA_SCAPS_OFFSCREENPLAIN   0x00000040
+#define VBOXVHWA_SCAPS_OVERLAY          0x00000080
+#define VBOXVHWA_SCAPS_PRIMARYSURFACE   0x00000200
+#define VBOXVHWA_SCAPS_SYSTEMMEMORY     0x00000800
+#define VBOXVHWA_SCAPS_VIDEOMEMORY      0x00004000
+#define VBOXVHWA_SCAPS_VISIBLE          0x00008000
+#define VBOXVHWA_SCAPS_LOCALVIDMEM      0x10000000
+
+#define VBOXVHWA_PF_RGB                 0x00000040
+#define VBOXVHWA_PF_RGBTOYUV            0x00000100
+#define VBOXVHWA_PF_YUV                 0x00000200
+#define VBOXVHWA_PF_FOURCC              0x00000004
+
+#define VBOXVHWA_LOCK_DISCARDCONTENTS   0x00002000
 
 #define VBOXVHWA_CFG_ENABLED            0x00000001
 
-#define VBOXVHWA_SD_BACKBUFFERCOUNT     0x00000001
-#define VBOXVHWA_SD_CAPS                0x00000002
-#define VBOXVHWA_SD_CKDESTBLT           0x00000004
-#define VBOXVHWA_SD_CKDESTOVERLAY       0x00000008
-#define VBOXVHWA_SD_CKSRCBLT            0x00000010
-#define VBOXVHWA_SD_CKSRCOVERLAY        0x00000020
-#define VBOXVHWA_SD_HEIGHT              0x00000040
-#define VBOXVHWA_SD_PITCH               0x00000080
-#define VBOXVHWA_SD_PIXELFORMAT         0x00000100
-//#define VBOXVHWA_SD_REFRESHRATE       0x00000200
-#define VBOXVHWA_SD_WIDTH               0x00000400
+#define VBOXVHWA_SD_BACKBUFFERCOUNT     0x00000020
+#define VBOXVHWA_SD_CAPS                0x00000001
+#define VBOXVHWA_SD_CKDESTBLT           0x00004000
+#define VBOXVHWA_SD_CKDESTOVERLAY       0x00002000
+#define VBOXVHWA_SD_CKSRCBLT            0x00010000
+#define VBOXVHWA_SD_CKSRCOVERLAY        0x00008000
+#define VBOXVHWA_SD_HEIGHT              0x00000002
+#define VBOXVHWA_SD_PITCH               0x00000008
+#define VBOXVHWA_SD_PIXELFORMAT         0x00001000
+//#define VBOXVHWA_SD_REFRESHRATE       0x00040000
+#define VBOXVHWA_SD_WIDTH               0x00000004
 
 #define VBOXVHWA_CKEYCAPS_DESTBLT                  0x00000001
@@ -473 +474 @@
 #define VBOXVHWA_CKEYCAPS_DESTOVERLAYONEACTIVE     0x00000080
 #define VBOXVHWA_CKEYCAPS_DESTOVERLAYYUV           0x00000100
-#define VBOXVHWA_CKEYCAPS_NOCOSTOVERLAY            0x00000200
-#define VBOXVHWA_CKEYCAPS_SRCBLT                   0x00000400
-#define VBOXVHWA_CKEYCAPS_SRCBLTCLRSPACE           0x00000800
-#define VBOXVHWA_CKEYCAPS_SRCBLTCLRSPACEYUV        0x00001000
-#define VBOXVHWA_CKEYCAPS_SRCBLTYUV                0x00002000
-#define VBOXVHWA_CKEYCAPS_SRCOVERLAY               0x00004000
-#define VBOXVHWA_CKEYCAPS_SRCOVERLAYCLRSPACE       0x00008000
-#define VBOXVHWA_CKEYCAPS_SRCOVERLAYCLRSPACEYUV    0x00010000
-#define VBOXVHWA_CKEYCAPS_SRCOVERLAYONEACTIVE      0x00020000
-#define VBOXVHWA_CKEYCAPS_SRCOVERLAYYUV            0x00040000
-
+#define VBOXVHWA_CKEYCAPS_SRCBLT                   0x00000200
+#define VBOXVHWA_CKEYCAPS_SRCBLTCLRSPACE           0x00000400
+#define VBOXVHWA_CKEYCAPS_SRCBLTCLRSPACEYUV        0x00000800
+#define VBOXVHWA_CKEYCAPS_SRCBLTYUV                0x00001000
+#define VBOXVHWA_CKEYCAPS_SRCOVERLAY               0x00002000
+#define VBOXVHWA_CKEYCAPS_SRCOVERLAYCLRSPACE       0x00004000
+#define VBOXVHWA_CKEYCAPS_SRCOVERLAYCLRSPACEYUV    0x00008000
+#define VBOXVHWA_CKEYCAPS_SRCOVERLAYONEACTIVE      0x00010000
+#define VBOXVHWA_CKEYCAPS_SRCOVERLAYYUV            0x00020000
+#define VBOXVHWA_CKEYCAPS_NOCOSTOVERLAY            0x00040000
 
 #define VBOXVHWA_BLT_COLORFILL                      0x00000400