Changeset 33607 in vbox

Timestamp:

Oct 29, 2010 1:49:49 PM (14 years ago)

Author:

vboxsync

Message:

3d/wddm: fix up stream source tracking

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -3463 +3463 @@
     VBOXDISPCRHGSMI_SCOPE_SET_DEV(pDevice);
     HRESULT hr = S_OK;
-//    IDirect3DVertexBuffer9 *pStreamData;
-//    UINT cbOffset;
-//    UINT cbStride;
-//    hr = pDevice->pDevice9If->GetStreamSource(pData->Stream, &pStreamData, &cbOffset, &cbStride);
-//    Assert(hr == S_OK);
-//    if (hr == S_OK)
-//    {
-//        if (pStreamData)
-//        {
-//            Assert(0);
-//            /* @todo: impl! */
-//        }
-//        else
-//        {
-            Assert(pData->Stream < RT_ELEMENTS(pDevice->aStreamSourceUm));
-            PVBOXWDDMDISP_STREAMSOURCEUM pStrSrcUm = &pDevice->aStreamSourceUm[pData->Stream];
-            pStrSrcUm->pvBuffer = pUMBuffer;
-            pStrSrcUm->cbStride = pData->Stride;
-//        }
-//    }
+    IDirect3DVertexBuffer9 *pStreamData;
+    UINT cbOffset;
+    UINT cbStride;
+
+    Assert(pData->Stream < RT_ELEMENTS(pDevice->aStreamSourceUm));
+    PVBOXWDDMDISP_STREAMSOURCEUM pStrSrcUm = &pDevice->aStreamSourceUm[pData->Stream];
+    pStrSrcUm->pvBuffer = pUMBuffer;
+    pStrSrcUm->cbStride = pData->Stride;
+
+    hr = pDevice->pDevice9If->GetStreamSource(pData->Stream, &pStreamData, &cbOffset, &cbStride);
+    Assert(hr == S_OK);
+    if (hr==S_OK && pStreamData)
+    {
+        hr = pDevice->pDevice9If->SetStreamSource(pData->Stream, NULL, 0, 0);
+        pStreamData->Release();
+    }
+    
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));
     return hr;
@@ -6230 +6227 @@
         pDevice->StreamSourceInfo[pData->Stream].uiOffset = pData->Offset;
         pDevice->StreamSourceInfo[pData->Stream].uiStride = pData->Stride;
+
+        PVBOXWDDMDISP_STREAMSOURCEUM pStrSrcUm = &pDevice->aStreamSourceUm[pData->Stream];
+        pStrSrcUm->pvBuffer = NULL;
+        pStrSrcUm->cbStride = 0;
     }
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));
@@ -7957 +7958 @@
     va_end(pArgList);
 
-    OutputDebugStringA(szBuffer);
+    //OutputDebugStringA(szBuffer);
 }
 #endif