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

Timestamp:

Aug 1, 2012 10:26:43 AM (13 years ago)

Author:

vboxsync

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

79662

Message:

crOgl/wddm: per-context connections

Location:

trunk/src/VBox/GuestHost/OpenGL/include

Files:

• cr_net.h (modified) (3 diffs)
• cr_netserver.h (modified) (1 diff)

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

@@ -35 +35 @@
 
 #include <iprt/types.h>
+#include <iprt/thread.h>
     
 #ifdef __cplusplus
@@ -236 +237 @@
     uint32_t u32InjectClientID;
 # ifdef VBOX_WITH_CRHGSMI
-#  ifndef VBOX_CRHGSMI_WITH_D3DDEV
     CRVBOXHGSMI_CLIENT HgsmiClient;
-#  endif
+    struct VBOXUHGSMI *pExternalHgsmi;
 # endif
 #else
@@ -283 +283 @@
 extern DECLEXPORT(int) crNetNumMessages(CRConnection *conn);
 extern DECLEXPORT(void) crNetReadline( CRConnection *conn, void *buf );
-extern DECLEXPORT(int) crNetRecv( void );
-#define CR_WRITEBACK_WAIT() do { \
-        while (writeback) { \
-            crNetRecv();    \
-        }                   \
+extern DECLEXPORT(int) crNetRecv(
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                CRConnection *conn
+#endif
+        );
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+#define CR_WRITEBACK_WAIT(_conn, _writeback) do { \
+        while (_writeback) {     \
+            RTThreadYield();     \
+            crNetRecv(_conn);    \
+        }                        \
     } while (0)
+#else
+#define CR_WRITEBACK_WAIT(_conn, _writeback) do { \
+        while (_writeback) { \
+            RTThreadYield(); \
+            crNetRecv();     \
+        }                    \
+    } while (0)
+
+#endif
 extern DECLEXPORT(void) crNetDefaultRecv( CRConnection *conn, CRMessage *msg, unsigned int len );
 extern DECLEXPORT(void) crNetDispatchMessage( CRNetReceiveFuncList *rfl, CRConnection *conn, CRMessage *msg, unsigned int len );
 
-extern DECLEXPORT(CRConnection *) crNetConnectToServer( const char *server, unsigned short default_port, int mtu, int broker );
+extern DECLEXPORT(CRConnection *) crNetConnectToServer( const char *server, unsigned short default_port, int mtu, int broker
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+);
 extern DECLEXPORT(CRConnection *) crNetAcceptClient( const char *protocol, const char *hostname, unsigned short port, unsigned int mtu, int broker );
 

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

@@ -22 +22 @@
 } CRNetServer;
 
-DECLEXPORT(void) crNetServerConnect( CRNetServer *ns );
-DECLEXPORT(void) crNetNewClient( CRConnection *conn, CRNetServer *ns );
+DECLEXPORT(void) crNetServerConnect( CRNetServer *ns
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+                );
+DECLEXPORT(void) crNetNewClient( CRConnection *conn, CRNetServer *ns
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+);
 
 #ifdef __cplusplus