Changeset 29488 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Timestamp:

May 14, 2010 5:05:43 PM (15 years ago)

Author:

vboxsync

Message:

wddm: getcaps for d3d9, start impl 2D support

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Files:

• VBoxVideoIf.h (added)
• VBoxVideoWddm.cpp (modified) (4 diffs)
• VBoxVideoWddm.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -1280 +1280 @@
         }
         case DXGKQAITYPE_UMDRIVERPRIVATE:
-            drprintf((__FUNCTION__ ": we do not support DXGKQAITYPE_UMDRIVERPRIVATE\n"));
             AssertBreakpoint();
-            Status = STATUS_NOT_SUPPORTED;
+            Assert(pQueryAdapterInfo->InputDataSize > sizeof (VBOXWDDM_QI));
+            if (pQueryAdapterInfo->InputDataSize > sizeof (VBOXWDDM_QI)
+                    && pQueryAdapterInfo->OutputDataSize > sizeof (VBOXWDDM_QI))
+            {
+                VBOXWDDM_QI * pQi = (VBOXWDDM_QI*)pQueryAdapterInfo->pInputData;
+                switch (pQi->enmType)
+                {
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                    case VBOXWDDM_QI_TYPE_2D_1:
+                    {
+                        if (pQueryAdapterInfo->InputDataSize >= sizeof (VBOXWDDM_QI_2D_1)
+                                && pQueryAdapterInfo->OutputDataSize >= sizeof (VBOXWDDM_QI_2D_1))
+                        {
+                            VBOXWDDM_QI_2D_1 * pQueryIn = (VBOXWDDM_QI_2D_1*)pQueryAdapterInfo->pInputData;
+                            VBOXWDDM_QI_2D_1 * pQueryOut = (VBOXWDDM_QI_2D_1*)pQueryAdapterInfo->pOutputData;
+                            /* @todo: submit to the host */
+#if 0
+                            VBOXVHWACMD *pCmd = create-cmd;
+                            VBOXVHWACMD_QUERYINFO1 *pQueryCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO1);
+                            pQueryCmd->u.in.guestVersion = pQueryIn->Info.in.guestVersion;
+                            int rc = submit-cmd;
+                            pQueryOut->hdr.rc = rc;
+                            if (RT_SUCCESS(rc))
+                            {
+                                memcpy(&pQueryOut->Info, pQueryCmd, sizeof(VBOXVHWACMD_QUERYINFO1));
+                            }
+#else
+                            pQueryOut->hdr.rc = VERR_NOT_SUPPORTED;
+#endif
+                        }
+                        else
+                        {
+                            drprintf((__FUNCTION__ ": in or out buffer for VBOXWDDM_QI_TYPE_2D_1 too small\n"));
+                            Status = STATUS_BUFFER_TOO_SMALL;
+                        }
+                        break;
+                    }
+                    case VBOXWDDM_QI_TYPE_2D_2:
+                    {
+                        /* @todo: submit to the host */
+                        break;
+                    }
+#endif
+                    default:
+                        drprintf((__FUNCTION__ ": unsupported qi (%d)\n", pQi->enmType));
+                        AssertBreakpoint();
+                        Status = STATUS_INVALID_PARAMETER;
+                }
+            }
+            else
+            {
+                drprintf((__FUNCTION__ ": in or out buffer too small\n"));
+                Status = STATUS_BUFFER_TOO_SMALL;
+            }
             break;
         default:
@@ -1790 +1842 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     /* Value == 2 is Present
@@ -1897 +1949 @@
 //    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
@@ -3752 +3804 @@
     PAGED_CODE();
 
-    AssertBreakpoint();
+    vboxVDbgBreakFv();
 
     drprintf(("VBoxVideoWddm::DriverEntry. Built %s %s\n", __DATE__, __TIME__));

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h

@@ -34 +34 @@
 PVOID vboxWddmMemAllocZero(IN SIZE_T cbSize);
 VOID vboxWddmMemFree(PVOID pvMem);
-
-typedef enum
-{
-    VBOXWDDM_ALLOC_TYPE_UNEFINED = 0,
-    VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE,
-    VBOXWDDM_ALLOC_TYPE_STD_SHADOWSURFACE,
-    VBOXWDDM_ALLOC_TYPE_STD_STAGINGSURFACE,
-    /* this one is win 7-specific and hence unused for now */
-    VBOXWDDM_ALLOC_TYPE_STD_GDISURFACE
-    /* custom allocation types requested from user-mode d3d module will go here */
-} VBOXWDDM_ALLOC_TYPE;
-
-typedef struct VBOXWDDM_SURFACE_DESC
-{
-    UINT width;
-    UINT height;
-    D3DDDIFORMAT format;
-    UINT bpp;
-    UINT pitch;
-} VBOXWDDM_SURFACE_DESC, *PVBOXWDDM_SURFACE_DESC;
-
-typedef struct VBOXWDDM_ALLOCINFO
-{
-    VBOXWDDM_ALLOC_TYPE enmType;
-    union
-    {
-        VBOXWDDM_SURFACE_DESC SurfInfo;
-    } u;
-} VBOXWDDM_ALLOCINFO, *PVBOXWDDM_ALLOCINFO;
-
-#define VBOXWDDM_ALLOCINFO_HEADSIZE() (sizeof (VBOXWDDM_ALLOCINFO))
-#define VBOXWDDM_ALLOCINFO_SIZE_FROMBODYSIZE(_s) (VBOXWDDM_ALLOCINFO_HEADSIZE() + (_s))
-#define VBOXWDDM_ALLOCINFO_SIZE(_tCmd) (VBOXWDDM_ALLOCINFO_SIZE_FROMBODYSIZE(sizeof(_tCmd)))
-#define VBOXWDDM_ALLOCINFO_BODY(_p, _t) ( (_t*)(((uint8_t*)(_p)) + VBOXWDDM_ALLOCINFO_HEADSIZE()) )
-#define VBOXWDDM_ALLOCINFO_HEAD(_pb) ((VBOXWDDM_ALLOCINFO*)((uint8_t *)(_pb) - VBOXWDDM_ALLOCATION_HEADSIZE()))
-
 
 typedef struct VBOXWDDM_ALLOCINFO_SHAREDPRIMARYSURFACE