Changeset 29922 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 31, 2010 5:38:48 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

62189

Message:

wddm/2d: overlay surface creation fixes

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/VBoxFBOverlay.cpp (modified) (7 diffs)
• src/VBoxFBOverlay.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -144 +144 @@
  VirtualBox_DEFS        += VBOX_WITH_VIRTIO
 endif
-
+ifdef VBOXWDDM
+ VirtualBox_DEFS        += VBOXWDDM
+endif
 ifdef VBOX_BLEEDING_EDGE
 VirtualBox_src/VBoxSelectorWnd.cpp_DEFS += \

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -2422 +2422 @@
 }
 
+#ifdef VBOXWDDM
+int VBoxVHWAImage::vhwaSurfaceGetInfo(struct _VBOXVHWACMD_SURF_GETINFO *pCmd)
+{
+    VBoxVHWAColorFormat format;
+    Assert(!format.isValid());
+    if (pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_RGB)
+        format = VBoxVHWAColorFormat(pCmd->SurfInfo.PixelFormat.c.rgbBitCount,
+                                        pCmd->SurfInfo.PixelFormat.m1.rgbRBitMask,
+                                        pCmd->SurfInfo.PixelFormat.m2.rgbGBitMask,
+                                        pCmd->SurfInfo.PixelFormat.m3.rgbBBitMask);
+    else if (pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_FOURCC)
+        format = VBoxVHWAColorFormat(pCmd->SurfInfo.PixelFormat.fourCC);
+    else
+        AssertBreakpoint();
+
+    Assert(format.isValid());
+    if (format.isValid())
+    {
+        pCmd->SurfInfo.pitch = format.bitsPerPixel() * pCmd->SurfInfo.width / 8;
+//        pCmd->SurfInfo.pitch = ((pCmd->SurfInfo.pitch + 3) & (~3));
+        pCmd->SurfInfo.sizeX = format.bitsPerPixelMem() * pCmd->SurfInfo.width / 8;
+//        pCmd->SurfInfo.sizeX = ((pCmd->SurfInfo.sizeX + 3) & (~3));
+        pCmd->SurfInfo.sizeX *= pCmd->SurfInfo.height;
+        pCmd->SurfInfo.sizeY = 1;
+        return VINF_SUCCESS;
+    }
+    return VERR_INVALID_PARAMETER;
+}
+#endif
 int VBoxVHWAImage::vhwaSurfaceDestroy(struct _VBOXVHWACMD_SURF_DESTROY *pCmd)
 {
@@ -3883 +3912 @@
         case FOURCC_AYUV:
             mBitsPerPixel = 32;
+#ifdef VBOXWDDM
+            mBitsPerPixelMem = 32;
+#endif
             mWidthCompression = 1;
             break;
@@ -3888 +3920 @@
         case FOURCC_YUY2:
             mBitsPerPixel = 16;
+#ifdef VBOXWDDM
+            mBitsPerPixelMem = 16;
+#endif
             mWidthCompression = 2;
             break;
         case FOURCC_YV12:
             mBitsPerPixel = 8;
+#ifdef VBOXWDDM
+            mBitsPerPixelMem = 12;
+#endif
             mWidthCompression = 4;
             break;
@@ -3898 +3936 @@
             mBitsPerPixel = 0;
             mBitsPerPixelTex = 0;
+#ifdef VBOXWDDM
+            mBitsPerPixelMem = 0;
+#endif
             mWidthCompression = 0;
             break;
@@ -3907 +3948 @@
     mBitsPerPixel = bitsPerPixel;
     mBitsPerPixelTex = bitsPerPixel;
+#ifdef VBOXWDDM
+    mBitsPerPixelMem = bitsPerPixel;
+#endif
     mDataFormat = 0;
     switch (bitsPerPixel)
@@ -3964 +4008 @@
             mBitsPerPixel = 0;
             mBitsPerPixelTex = 0;
+#ifdef VBOXWDDM
+            mBitsPerPixelMem = 0;
+#endif
             break;
     }
@@ -4594 +4641 @@
             pCmd->rc = vhwaConstruct(pBody);
         } break;
+#ifdef VBOXWDDM
+        case VBOXVHWACMD_TYPE_SURF_GETINFO:
+        {
+            VBOXVHWACMD_SURF_GETINFO * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_GETINFO);
+            pCmd->rc = mOverlayImage.vhwaSurfaceGetInfo(pBody);
+        } break;
+#endif
         default:
             Assert(0);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -232 +232 @@
     uint32_t bitsPerPixel() const { return mBitsPerPixel; }
     uint32_t bitsPerPixelTex() const { return mBitsPerPixelTex; }
+#ifdef VBOXWDDM
+    uint32_t bitsPerPixelMem() const { return mBitsPerPixelMem; }
+#endif
     void pixel2Normalized(uint32_t pix, float *r, float *g, float *b) const;
     uint32_t widthCompression() const {return mWidthCompression;}
@@ -267 +270 @@
     uint32_t mBitsPerPixel;
     uint32_t mBitsPerPixelTex;
+#ifdef VBOXWDDM
+    uint32_t mBitsPerPixelMem;
+#endif
     uint32_t mWidthCompression;
     uint32_t mHeightCompression;
@@ -1479 +1485 @@
     int vhwaSurfaceCanCreate(struct _VBOXVHWACMD_SURF_CANCREATE *pCmd);
     int vhwaSurfaceCreate(struct _VBOXVHWACMD_SURF_CREATE *pCmd);
+#ifdef VBOXWDDM
+    int vhwaSurfaceGetInfo(struct _VBOXVHWACMD_SURF_GETINFO *pCmd);
+#endif
     int vhwaSurfaceDestroy(struct _VBOXVHWACMD_SURF_DESTROY *pCmd);
     int vhwaSurfaceLock(struct _VBOXVHWACMD_SURF_LOCK *pCmd);