Changeset 78408 in vbox for trunk/src/VBox/GuestHost/OpenGL/include

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/GuestHost/OpenGL/include

Files:

• cr_spu.h (modified) (3 diffs)
• cr_threads.h (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_spu.h

@@ -76 +76 @@
 #define SPU_MAX_SERVERS_UNLIMITED 0x8
 
+/**
+ * SPU registration restructure.
+ */
+typedef struct SPUREG
+{
+    /** SPU name. */
+    const char             *pszName;
+    /** Name of the SPU super class. */
+    const char             *pszSuperName;
+    /** SPU flags. */
+    uint32_t               fFlags;
+    /** Init function. */
+    SPUInitFuncPtr         pfnInit;
+    /** Dispatch function. */
+    SPUSelfDispatchFuncPtr pfnDispatch; 
+    /** Cleanup function. */
+    SPUCleanupFuncPtr      pfnCleanup;
+} SPUREG;
+/** Pointer to a SPU registration structure. */
+typedef SPUREG *PSPUREG;
+/** Pointer to a const SPU registration structure. */
+typedef const SPUREG *PCSPUREG;
 
 /**
@@ -346 +368 @@
 DECLEXPORT(void) crSPUUnloadChain(SPU *headSPU);
 
+DECLEXPORT(SPU *) crSPUInitFromReg(SPU *pSpuChild, int iId, const char *pszName, void *pvServer, PCSPUREG *papSpuReg);
+DECLEXPORT(SPU *) crSPUInitChainFromReg(int cSpus, int *paIds, const char * const *papszNames, void *server, PCSPUREG *papSpuReg);
+
 DECLEXPORT(void) crSPUInitDispatchTable( SPUDispatchTable *table );
 DECLEXPORT(void) crSPUCopyDispatchTable( SPUDispatchTable *dst, SPUDispatchTable *src );
@@ -378 +403 @@
 #endif
 
+extern DECLHIDDEN(const SPUREG) g_ErrorSpuReg;
+#ifdef IN_GUEST
+extern DECLHIDDEN(const SPUREG) g_FeedbackSpuReg;
+extern DECLHIDDEN(const SPUREG) g_PassthroughSpuReg;
+extern DECLHIDDEN(const SPUREG) g_PackSpuReg;
+#else
+extern DECLHIDDEN(const SPUREG) g_RenderSpuReg;
+#endif
+
 #ifdef __cplusplus
 }

trunk/src/VBox/GuestHost/OpenGL/include/cr_threads.h

@@ -110 +110 @@
 #define VBoxTlsRefSetImpl(_tls, _val) (crSetTSD((CRtsd*)(_tls), (_val)))
 #define VBoxTlsRefAssertImpl CRASSERT
-#include <VBoxVideo3D.h>
+#include <VBox/Graphics/VBoxVideo3D.h>
 
 #ifdef __cplusplus