Changeset 56008 in vbox for trunk/src

Timestamp:

May 21, 2015 3:07:13 PM (10 years ago)

Author:

vboxsync

Message:

Additions/common/crOpenGL: fixed detection of CrHgsmi transport in packspu for Windows guest.

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Makefile.kmk (modified) (2 diffs)
• pack/packspu.h (modified) (2 diffs)
• pack/packspu_init.c (modified) (2 diffs)

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

@@ -581 +581 @@
         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB)
+VBoxOGLpackspu_LIBS.win += \
+        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
+
 ifdef VBOX_WITH_CRHGSMI
 VBoxOGLpackspu_DEFS.win   += VBOX_WITH_CRHGSMI
@@ -604 +608 @@
         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
+VBoxOGLpackspu-x86_LIBS.win += \
+        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
 VBoxOGLpackspu-x86_DEFS = $(VBoxOGLpackspu_DEFS) VBOX_WDDM_WOW64
 endif

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.h

@@ -95 +95 @@
 
 #if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
-    bool bRunningUnderWDDM;
+    bool bIsWDDMCrHgsmi;
 #endif
 
@@ -147 +147 @@
 
 #if defined(WINDOWS) && defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-# define CRPACKSPU_IS_WDDM_CRHGSMI() (pack_spu.bRunningUnderWDDM)
+# define CRPACKSPU_IS_WDDM_CRHGSMI() (pack_spu.bIsWDDMCrHgsmi)
 #else
 # define CRPACKSPU_IS_WDDM_CRHGSMI() (GL_FALSE)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c

@@ -27 +27 @@
 #endif
 
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+# include <VBox/VBoxCrHgsmi.h>
+# include <VBox/VBoxUhgsmi.h>
+#endif
+
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_WDDM)
+static bool isVBoxWDDMCrHgsmi(void)
+{
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+    PVBOXUHGSMI pHgsmi = VBoxCrHgsmiCreate();
+    if (pHgsmi)
+    {
+        VBoxCrHgsmiDestroy(pHgsmi);
+        return true;
+    }
+#endif
+    return false;
+}
+#endif /* RT_OS_WINDOWS && VBOX_WITH_WDDM */
+
 static SPUFunctions *
 packSPUInit( int id, SPU *child, SPU *self,
@@ -53 +73 @@
 
 #if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
-    pack_spu.bRunningUnderWDDM = !!GetModuleHandle(VBOX_MODNAME_DISPD3D);
+    pack_spu.bIsWDDMCrHgsmi = isVBoxWDDMCrHgsmi();
 #endif