Changeset 51770 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Timestamp:

Jul 1, 2014 6:14:02 PM (10 years ago)

Author:

vboxsync

Message:

Merged in iprt++ dev branch.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp

@@ -1263 +1263 @@
 NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData)
 {
-    VBOXMP_CRPACKER CrPacker;
-    VBoxMpCrPackerInit(&CrPacker);
     uint32_t u32CrConClientID;
-
     NTSTATUS Status = vboxVdmaCrCtlGetDefaultClientId(pDevExt, &u32CrConClientID);
     if (!NT_SUCCESS(Status))
@@ -1273 +1270 @@
         return Status;
     }
+
+    VBOXMP_CRPACKER *pCrPacker = (VBOXMP_CRPACKER *)RTMemTmpAlloc(sizeof(*pCrPacker));
+    if (!pCrPacker)
+        return STATUS_NO_MEMORY;
+    VBoxMpCrPackerInit(pCrPacker);
 
     RECT Rect;
@@ -1281 +1283 @@
 
     if (pDevExt->fCmdVbvaEnabled)
-        return vboxVdmaTexPresentSubmit(pDevExt, &CrPacker, u32CrConClientID, pAllocData->hostID, pAllocData->SurfDesc.VidPnSourceId, 0, 0, 1, (RTRECT*)&Rect);
-
-    if (pDevExt->fTexPresentEnabled)
+        Status = vboxVdmaTexPresentSubmit(pDevExt, pCrPacker, u32CrConClientID, pAllocData->hostID, pAllocData->SurfDesc.VidPnSourceId, 0, 0, 1, (RTRECT*)&Rect);
+    else if (pDevExt->fTexPresentEnabled)
     {
         VBOXVDMAPIPE_RECTS RectInfo;
@@ -1290 +1291 @@
         RectInfo.UpdateRects.aRects[0] = Rect;
 
-        return vboxVdmaProcessVRegTexPresent(pDevExt, &CrPacker, u32CrConClientID,
+        Status = vboxVdmaProcessVRegTexPresent(pDevExt, pCrPacker, u32CrConClientID,
                 pAllocData, pAllocData,
                 &Rect, &RectInfo);
     }
-
-    return STATUS_NOT_IMPLEMENTED;
+    else
+        Status = STATUS_NOT_IMPLEMENTED;
+
+    RTMemTmpFree(pCrPacker);
+    return Status;
 }