Changeset 78408 in vbox for trunk/src/VBox/Additions/common/crOpenGL/pack

Timestamp:

May 6, 2019 9:31:01 PM (6 years ago)

Author:

vboxsync

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

130405

Message:

Additions,GuestHost/OpenGL,HostServices/SharedOpenGL: Get rid of the individual SPU shared libraries and merge them into the VBoxSharedCrOpenGL shared libraries on the host and VBoxOGL{,-x86} shared libraries for the guest additions, bugref:9435

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu_init.c (modified) (2 diffs)
• packspu_misc.c (modified) (1 diff)

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

@@ -57 +57 @@
     (void) self;
 
-#if !defined(WINDOWS)
     crInitMutex(&_PackMutex);
-#endif
 
     crInitTSD(&_PackerTSD);
@@ -122 +120 @@
     crFreeTSD(&_PackTSD);
     crUnlockMutex(&_PackMutex);
-#ifndef WINDOWS
     crFreeMutex(&_PackMutex);
-#endif
+    crNetTearDown(); /** @todo Why here? */
     return 1;
 }
 
-int SPULoad( char **name, char **super, SPUInitFuncPtr *init,
-         SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup,
-         int *flags )
-{
-    *name = "pack";
-    *super = NULL;
-    *init = packSPUInit;
-    *self = packSPUSelfDispatch;
-    *cleanup = packSPUCleanup;
-    *flags = (SPU_HAS_PACKER|SPU_IS_TERMINAL|SPU_MAX_SERVERS_ONE);
-
-    return 1;
-}
+DECLHIDDEN(const SPUREG) g_PackSpuReg =
+ {
+    /** pszName. */
+    "pack",
+    /** pszSuperName. */
+    NULL,
+    /** fFlags. */
+    SPU_HAS_PACKER | SPU_IS_TERMINAL | SPU_MAX_SERVERS_ONE,
+    /** pfnInit. */
+    packSPUInit,
+    /** pfnDispatch. */
+    packSPUSelfDispatch, 
+    /** pfnCleanup. */
+    packSPUCleanup
+};

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

@@ -704 +704 @@
 }
 
-#ifdef WINDOWS
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
-{
-    (void) lpvReserved;
-
-    switch (fdwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-        {
-            crInitMutex(&_PackMutex);
-            break;
-        }
-
-        case DLL_PROCESS_DETACH:
-        {
-            crFreeMutex(&_PackMutex);
-            crNetTearDown();
-            break;
-        }
-
-        case DLL_THREAD_ATTACH:
-        case DLL_THREAD_DETACH:
-        default:
-            break;
-    }
-
-    return TRUE;
-}
-#endif
-
 void PACKSPU_APIENTRY packspu_VBoxPresentComposition(GLint win, const struct VBOXVR_SCR_COMPOSITOR * pCompositor,
                                                      const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry)