Changeset 19464 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

May 6, 2009 9:12:09 PM (16 years ago)

Author:

vboxsync

Message:

HGSMI support makefile fixes, basics for passing ddraw command to host

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/Makefile.kmk (modified) (2 diffs)
• Display/driver.h (modified) (9 diffs)
• Display/vbox.c (modified) (4 diffs)
• Miniport/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

@@ -33 +33 @@
 VBoxDisp_DEFS        += VBOX_VBVA_ADJUST_RECT
 #VBoxDisp_DEFS        += LOG_ENABLED
+ifdef VBOX_WITH_VIDEOHWACCEL
+VBoxDisp_DEFS        += VBOX_WITH_VIDEOHWACCEL
+endif
 #VBoxDisp_DEFS        += STAT_sunlover
 VBoxDisp_SOURCES     = \
@@ -59 +62 @@
 VBoxDisp_LIBS         += \
         $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
+VBoxDisp_DEFS += VBOX_WITH_HGSMI
 endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -75 +75 @@
 {
     ULONG cbVRAM;
-    
+
     ULONG offFrameBuffer;
     ULONG cbFrameBuffer;
-    
+
     ULONG offDDRAWHeap; //@todo
     ULONG cbDDRAWHeap;
-    
+
     ULONG offVBVABuffer;
     ULONG cbVBVABuffer;
-    
+
     ULONG offDisplayInformation;
     ULONG cbDisplayInformation;
@@ -111 +111 @@
     ULONG   ulMode;                     // Mode the mini-port driver is in.
     LONG    lDeltaScreen;               // Distance from one scan to the next.
-    
+
     PVOID   pOffscreenList;             // linked list of DCI offscreen surfaces.
     FLONG   flRed;                      // For bitfields device, Red Mask
@@ -128 +128 @@
     BOOL    bSupportDCI;                // Does the miniport support DCI?
     FLONG   flHooks;
-    
+
 #ifndef VBOX_WITH_HGSMI
     VBVAENABLERESULT vbva;
@@ -165 +165 @@
     VBVABUFFER *pVBVA; /* Pointer to the pjScreen + layout->offVBVABuffer. NULL if VBVA is not enabled. */
 #endif /* VBOX_WITH_HGSMI */
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    BOOLEAN bVHWAEnabled;
+#endif
 };
 
-#ifdef VBOX_WITH_OPENGL 
-typedef struct 
-{ 
-    DWORD dwVersion; 
-    DWORD dwDriverVersion; 
-    WCHAR szDriverName[256]; 
-} OPENGL_INFO, *POPENGL_INFO; 
-#endif 
+#ifdef VBOX_WITH_OPENGL
+typedef struct
+{
+    DWORD dwVersion;
+    DWORD dwDriverVersion;
+    WCHAR szDriverName[256];
+} OPENGL_INFO, *POPENGL_INFO;
+#endif
 
 #ifndef VBOX_WITH_HGSMI
@@ -245 +249 @@
 void drvLoadEng (void);
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+VBVAVHWACMD_HDR* vboxVHWACreateCommand (PPDEV ppdev, VBVAVHWACMD_LENGTH cbCmd);
+void vboxVHWAFreeCommand (PPDEV ppdev, VBVAVHWACMD_HDR* pCmd);
+void vboxVHWASubmitCommand (PPDEV ppdev, VBVAVHWACMD_HDR* pCmd);
+#endif
+
 BOOL bIsScreenSurface (SURFOBJ *pso);
 
@@ -252 +262 @@
     {
         PPDEV ppdev = (PPDEV)pso->dhpdev;
-    
+
         if (ppdev)
         {
@@ -262 +272 @@
         }
     }
-    
+
     return pso;
 }
@@ -276 +286 @@
         case BMF_32BPP: return 4;
     }
-    
+
     return 0;
 }
@@ -290 +300 @@
 #define VRDP_TEXT_MAX_GLYPH_SIZE 0x100
 #define VRDP_TEXT_MAX_GLYPHS     0xfe
- 
+
 BOOL vboxReportText (PPDEV ppdev,
                      VRDPCLIPRECTS *pClipRects,

trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c

@@ -55 +55 @@
 
     DISPDBG((1, "VBoxDisp::vboxVbvaEnable called\n"));
-    
+
     if (!ghsemHwBuffer)
     {
@@ -388 +388 @@
 
     DISPDBG((1, "VBoxDisp::vboxVbvaEnable called\n"));
-    
+
     if (ppdev->bHGSMISupported)
     {
         VBVABUFFER *pVBVA = (VBVABUFFER *)((uint8_t *)ppdev->pjScreen + ppdev->layout.offVBVABuffer);
-        
+
         pVBVA->u32HostEvents      = 0;
         pVBVA->u32SupportedOrders = 0;
@@ -406 +406 @@
         ppdev->pRecord           = NULL;
         ppdev->pVBVA             = pVBVA;
-        
+
         bRc = vboxVBVAInformHost (ppdev, TRUE);
     }
@@ -689 +689 @@
     return;
 }
+
+# ifdef VBOX_WITH_VIDEOHWACCEL
+
+VBVAVHWACMD_HDR* vboxVHWACreateCommand (PPDEV ppdev, VBVAVHWACMD_LENGTH cbCmd)
+{
+    VBVAVHWACMD_HDR* pHdr = (VBVAVHWACMD_HDR*)HGSMIHeapAlloc (&ppdev->hgsmiDisplayHeap,
+                              cbCmd,
+                              HGSMI_CH_VBVA,
+                              VBVA_VHWA_CMD);
+    if (!pHdr)
+    {
+        DISPDBG((0, "VBoxDISP::vboxVHWACreateCommand: HGSMIHeapAlloc failed\n"));
+    }
+
+    return pHdr;
+}
+
+void vboxVHWAFreeCommand (PPDEV ppdev, VBVAVHWACMD_HDR* pCmd)
+{
+    HGSMIHeapFree (&ppdev->hgsmiDisplayHeap, pCmd);
+}
+
+void vboxVHWASubmitCommand (PPDEV ppdev, VBVAVHWACMD_HDR* pCmd)
+{
+    vboxHGSMIBufferSubmit (ppdev, pCmd);
+}
+
+# endif
+
 #endif /* VBOX_WITH_HGSMI */

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

@@ -59 +59 @@
 VBoxVideo_LIBS         += \
         $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
+VBoxVideo_DEFS += VBOX_WITH_HGSMI
 endif