Changeset 54834 in vbox

Timestamp:

Mar 18, 2015 3:08:46 PM (10 years ago)

Author:

vboxsync

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

99036

Message:

Frontend,SharedOpenGL: 3D notification without safearray.

Location:

trunk

Files:

• include/VBox/VBoxVideo3D.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window.cpp (modified) (1 diff)

trunk/include/VBox/VBoxVideo3D.h

@@ -138 +138 @@
 
 /* host 3D->Fe[/Qt] notification mechanism defines */
-#define VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA  2
 #define VBOX3D_NOTIFY_EVENT_TYPE_TEST_FUNCTIONAL 3
+#define VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_VISIBLE  4
+#define VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_HIDDEN   5
 
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -1008 +1008 @@
     }
 
-    com::SafeArray<BYTE> eventData(ComSafeArrayInArg(data));
+    // com::SafeArray<BYTE> eventData(ComSafeArrayInArg(data));
     switch (uType)
     {
-        case VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA:
+        case VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_VISIBLE:
+        case VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_HIDDEN:
         {
             /* Notify machine-view with the async-signal
              * about 3D overlay visibility change: */
-            BOOL fVisible = eventData[0];
+            BOOL fVisible = uType == VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_VISIBLE;
             LogRel2(("GUI: UIFrameBufferPrivate::Notify3DEvent: Sending to async-handler: "
-                     "(VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA = %s)\n",
-                     fVisible ? "TRUE" : "FALSE"));
+                     "(VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_%s)\n",
+                     fVisible ? "VISIBLE" : "HIDDEN"));
             emit sigNotifyAbout3DOverlayVisibilityChange(fVisible);
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window.cpp

@@ -322 +322 @@
     if (mFlags.fNeVisible != fVisible || mFlags.fNeForce)
     {
-        crVBoxServerNotifyEvent(mu32Screen, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA, &fVisible, sizeof(fVisible));
+        crVBoxServerNotifyEvent(mu32Screen,
+                                fVisible? VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_VISIBLE:
+                                          VBOX3D_NOTIFY_EVENT_TYPE_3DDATA_HIDDEN,
+                                NULL, 0);
         mFlags.fNeVisible = fVisible;
         mFlags.fNeForce = 0;