Changeset 55825 in vbox for trunk/src/VBox/Additions

Timestamp:

May 12, 2015 12:51:48 PM (10 years ago)

Author:

vboxsync

Message:

3D: Additions: provide Windows ICD driver with HGSMI connection.

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Makefile.kmk (modified) (2 diffs)
• icd_drv.c (modified) (4 diffs)
• load.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -207 +207 @@
         $(VBOX_LIB_OGL_CRUTIL) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
+
+VBoxOGL_LIBS.win += \
+        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
+
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGL_LIBS += \
@@ -242 +247 @@
         $(VBOX_LIB_OGL_CRUTIL_X86) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
+
+VBoxOGL-x86_LIBS.win += \
+        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
+
+
 VBoxOGL-x86_SOURCES.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_SOURCES.win))
 VBoxOGL-x86_CLEAN.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_CLEAN.win))

trunk/src/VBox/Additions/common/crOpenGL/icd_drv.c

@@ -22 +22 @@
 #include "stub.h"
 #include "cr_mem.h"
+
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+# include <VBox/VBoxCrHgsmi.h>
+# include <VBox/VBoxUhgsmi.h>
+#endif
 
 #include <windows.h>
@@ -155 +160 @@
     char dpyName[MAX_DPY_NAME];
     ContextInfo *context;
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    PVBOXUHGSMI pHgsmi = NULL;
+#endif
 
     CR_DDI_PROLOGUE();
@@ -170 +178 @@
 #endif
 
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    pHgsmi = VBoxCrHgsmiCreate();
+#endif
+
     context = stubNewContext(dpyName, desiredVisual, UNDECIDED, 0
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-        , NULL
+        , pHgsmi
 #endif
             );
@@ -301 +313 @@
 BOOL APIENTRY DrvDeleteContext(HGLRC hglrc)
 {
-    CR_DDI_PROLOGUE();
-    /*crDebug( "DrvDeleteContext(0x%x) called", hglrc );*/
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    ContextInfo *pContext;
+    PVBOXUHGSMI pHgsmi = NULL;
+#endif
+
+    CR_DDI_PROLOGUE();
+    crDebug( "DrvDeleteContext(0x%x) called", hglrc );
+
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    crHashtableLock(stub.contextTable);
+
+    pContext = (ContextInfo *) crHashtableSearch(stub.contextTable, (unsigned long) hglrc);
+    if (pContext)
+        pHgsmi = pContext->pHgsmi;
+
+    crHashtableUnlock(stub.contextTable);
+#endif
+
     stubDestroyContext( (unsigned long) hglrc );
-    return 1;
+
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    if (pHgsmi)
+        VBoxCrHgsmiDestroy(pHgsmi);
+#endif
+
+    return true;
 }
 

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -1460 +1460 @@
         }
 
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        VBoxCrHgsmiInit();
+#endif
         break;
     }
@@ -1474 +1477 @@
         }
 
+        
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+        VBoxCrHgsmiTerm();
+#endif
+
         stubSPUSafeTearDown();