Changeset 30214 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Timestamp:

Jun 15, 2010 6:56:52 PM (15 years ago)

Author:

vboxsync

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

62697

Message:

wddm/2d: bugfixing

File:

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

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

@@ -1158 +1158 @@
                 {
                     DDRAW_CAPS *pCaps = (DDRAW_CAPS*)pData->pData;
-                    pCaps->Caps |= DDRAW_CAPS_COLORKEY
-                            | DDRAW_CAPS2_DYNAMICTEXTURES
-                            | DDRAW_CAPS2_FLIPNOVSYNC
-                            ;
+                    pCaps->Caps |= DDRAW_CAPS_COLORKEY;
+                    pCaps->Caps2 |= DDRAW_CAPS2_FLIPNOVSYNC;
                 }
 #endif
@@ -1242 +1240 @@
         case D3DDDICAPS_GETD3D3CAPS:
             Assert(!VBOXDISPMODE_IS_3D(pAdapter));
-            Assert(pData->DataSize >= sizeof (D3DHAL_GLOBALDRIVERDATA));
+            Assert(pData->DataSize == sizeof (D3DHAL_GLOBALDRIVERDATA));
             if (pData->DataSize >= sizeof (D3DHAL_GLOBALDRIVERDATA))
             {
@@ -1255 +1253 @@
                 pCaps->hwCaps.dcmColorModel = D3DCOLOR_RGB;
                 pCaps->hwCaps.dwDevCaps = D3DDEVCAPS_CANRENDERAFTERFLIP
-                        | D3DDEVCAPS_DRAWPRIMTLVERTEX
+//                        | D3DDEVCAPS_DRAWPRIMTLVERTEX
                         | D3DDEVCAPS_EXECUTESYSTEMMEMORY
-                        | D3DDEVCAPS_FLOATTLVERTEX
+                        | D3DDEVCAPS_EXECUTEVIDEOMEMORY
+//                        | D3DDEVCAPS_FLOATTLVERTEX
                         | D3DDEVCAPS_HWRASTERIZATION
-                        | D3DDEVCAPS_HWTRANSFORMANDLIGHT
-                        | D3DDEVCAPS_TLVERTEXSYSTEMMEMORY
-                        | D3DDEVCAPS_TEXTUREVIDEOMEMORY;
+//                        | D3DDEVCAPS_HWTRANSFORMANDLIGHT
+//                        | D3DDEVCAPS_TLVERTEXSYSTEMMEMORY
+//                        | D3DDEVCAPS_TEXTUREVIDEOMEMORY
+                        ;
                 pCaps->hwCaps.dtcTransformCaps.dwSize = sizeof (D3DTRANSFORMCAPS);
                 pCaps->hwCaps.dtcTransformCaps.dwCaps = 0;
@@ -1298 +1298 @@
                 pCaps->hwCaps.dpcTriCaps.dwStippleWidth = 0;
                 pCaps->hwCaps.dpcTriCaps.dwStippleHeight = 0;
-                pCaps->hwCaps.dwDeviceRenderBitDepth = 0;
-                pCaps->hwCaps.dwDeviceZBufferBitDepth = DDBD_8 | DDBD_16 | DDBD_24 | DDBD_32;
+                pCaps->hwCaps.dwDeviceRenderBitDepth = DDBD_8 | DDBD_16 | DDBD_24 | DDBD_32;
+                pCaps->hwCaps.dwDeviceZBufferBitDepth = 0;
                 pCaps->hwCaps.dwMaxBufferSize = 0;
                 pCaps->hwCaps.dwMaxVertexCount = 0;
@@ -1306 +1306 @@
                 pCaps->dwNumVertices = 0;
                 pCaps->dwNumClipVertices = 0;
-                pCaps->dwNumTextureFormats = pAdapter->cSurfDescs;
-                pCaps->lpTextureFormats = pAdapter->paSurfDescs;
+                pCaps->dwNumTextureFormats = 0;//pAdapter->cSurfDescs;
+                pCaps->lpTextureFormats = NULL;//pAdapter->paSurfDescs;
             }
             else
@@ -1314 +1314 @@
         case D3DDDICAPS_GETD3D7CAPS:
             Assert(!VBOXDISPMODE_IS_3D(pAdapter));
-            Assert(pData->DataSize >= sizeof (D3DHAL_D3DEXTENDEDCAPS));
+            Assert(pData->DataSize == sizeof (D3DHAL_D3DEXTENDEDCAPS));
             if (pData->DataSize >= sizeof (D3DHAL_D3DEXTENDEDCAPS))
+            {
                 memset(pData->pData, 0, sizeof (D3DHAL_D3DEXTENDEDCAPS));
+                D3DHAL_D3DEXTENDEDCAPS *pCaps = (D3DHAL_D3DEXTENDEDCAPS*)pData->pData;
+                pCaps->dwSize = sizeof (D3DHAL_D3DEXTENDEDCAPS);
+            }
             else
                 hr = E_INVALIDARG;
@@ -1397 +1401 @@
             *((uint32_t*)pData->pData) = 0;
             break;
+        case D3DDDICAPS_GETVIDEOPROCESSORCAPS:
+        case D3DDDICAPS_GETEXTENSIONGUIDCOUNT:
+        case D3DDDICAPS_GETDECODEGUIDCOUNT:
+        case D3DDDICAPS_GETVIDEOPROCESSORDEVICEGUIDCOUNT:
+            if (pData->pData && pData->DataSize)
+                memset(pData->pData, 0, pData->DataSize);
+            break;
         case D3DDDICAPS_GETMULTISAMPLEQUALITYLEVELS:
         case D3DDDICAPS_GETD3D5CAPS:
         case D3DDDICAPS_GETD3D6CAPS:
         case D3DDDICAPS_GETD3D8CAPS:
-        case D3DDDICAPS_GETDECODEGUIDCOUNT:
         case D3DDDICAPS_GETDECODEGUIDS:
         case D3DDDICAPS_GETDECODERTFORMATCOUNT:
@@ -1409 +1419 @@
         case D3DDDICAPS_GETDECODECONFIGURATIONCOUNT:
         case D3DDDICAPS_GETDECODECONFIGURATIONS:
-        case D3DDDICAPS_GETVIDEOPROCESSORDEVICEGUIDCOUNT:
         case D3DDDICAPS_GETVIDEOPROCESSORDEVICEGUIDS:
         case D3DDDICAPS_GETVIDEOPROCESSORRTFORMATCOUNT:
@@ -1415 +1424 @@
         case D3DDDICAPS_GETVIDEOPROCESSORRTSUBSTREAMFORMATCOUNT:
         case D3DDDICAPS_GETVIDEOPROCESSORRTSUBSTREAMFORMATS:
-        case D3DDDICAPS_GETVIDEOPROCESSORCAPS:
         case D3DDDICAPS_GETPROCAMPRANGE:
         case D3DDDICAPS_FILTERPROPERTYRANGE:
-        case D3DDDICAPS_GETEXTENSIONGUIDCOUNT:
         case D3DDDICAPS_GETEXTENSIONGUIDS:
         case D3DDDICAPS_GETEXTENSIONCAPS:
@@ -2371 +2378 @@
 
 
-        hr = pDevice->RtCallbacks.pfnLockCb(hDevice, &LockData);
+        hr = pDevice->RtCallbacks.pfnLockCb(pDevice->hDevice, &LockData);
         Assert(hr == S_OK || (hr == D3DERR_WASSTILLDRAWING && pData->Flags.DoNotWait));
         if (hr == S_OK)
@@ -2392 +2399 @@
             else
             {
-                AssertBreakpoint();
+                offset = 0;
             }
 
@@ -2510 +2517 @@
         UnlockData.hAllocation = pRc->aAllocations[pData->SubResourceIndex].hAllocation;
 
-        hr = pDevice->RtCallbacks.pfnUnlockCb(hDevice, &UnlockData.Unlock);
+        hr = pDevice->RtCallbacks.pfnUnlockCb(pDevice->hDevice, &UnlockData.Unlock);
         Assert(hr == S_OK);
     }
@@ -3105 +3112 @@
     PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice;
     Assert(pDevice);
-    Assert(pDevice->pDevice9If);
-    HRESULT hr = pDevice->pDevice9If->Present(NULL, /* CONST RECT * pSourceRect */
-            NULL, /* CONST RECT * pDestRect */
-            NULL, /* HWND hDestWindowOverride */
-            NULL /*CONST RGNDATA * pDirtyRegion */
-            );
-    Assert(hr == S_OK);
+    HRESULT hr = S_OK;
+    if (VBOXDISPMODE_IS_3D(pDevice->pAdapter))
+    {
+        Assert(pDevice->pDevice9If);
+        hr = pDevice->pDevice9If->Present(NULL, /* CONST RECT * pSourceRect */
+                NULL, /* CONST RECT * pDestRect */
+                NULL, /* HWND hDestWindowOverride */
+                NULL /*CONST RGNDATA * pDirtyRegion */
+                );
+        Assert(hr == S_OK);
+    }
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));
     return hr;