Changeset 50251 in vbox

Timestamp:

Jan 28, 2014 10:19:33 AM (11 years ago)

Author:

vboxsync

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

91871

Message:

crOpenGL: disable some async notifications for now

Location:

trunk

Files:

• include/VBox/HostServices/VBoxCrOpenGLSvc.h (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (3 diffs)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/include/VBox/HostServices/VBoxCrOpenGLSvc.h

@@ -47 +47 @@
 #define SHCRGL_HOST_FN_CRCMD_NOTIFY_CMDS   (21)
 #define SHCRGL_HOST_FN_DEV_RESIZE          (22)
+#define SHCRGL_HOST_FN_VIEWPORT_CHANGED2 (23)
 /* crOpenGL guest functions */
 #define SHCRGL_GUEST_FN_WRITE       (2)
@@ -74 +75 @@
 #define SHCRGL_CPARMS_SET_OUTPUT_REDIRECT (1)
 #define SHCRGL_CPARMS_CRCMD_NOTIFY_CMDS (0)
-#define SHCRGL_CPARMS_VIEWPORT_CHANGED (1)
+#define SHCRGL_CPARMS_VIEWPORT_CHANGED (5)
+#define SHCRGL_CPARMS_VIEWPORT_CHANGED2 (1)
 #define SHCRGL_CPARMS_GET_CAPS (1)
 

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1149 +1149 @@
                 else
                 {
+#if 0
                     CHECK_ERROR_RET(pFramebuffer, Lock(), rc);
+#endif
 
                     do {
@@ -1173 +1175 @@
                         }
                     } while (0);
-
+#if 0
                     CHECK_ERROR_RET(pFramebuffer, Unlock(), rc);
+#endif
                 }
 
@@ -1219 +1222 @@
         }
         case SHCRGL_HOST_FN_VIEWPORT_CHANGED:
+        {
+            Log(("svcCall: SHCRGL_HOST_FN_VIEWPORT_CHANGED\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != SHCRGL_CPARMS_VIEWPORT_CHANGED)
+            {
+                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: cParms invalid - %d", cParms));
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            for (int i = 0; i < SHCRGL_CPARMS_VIEWPORT_CHANGED; ++i)
+            {
+                if (paParms[i].type != VBOX_HGCM_SVC_PARM_32BIT)
+                {
+                    LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: param[%d] type invalid - %d", i, paParms[i].type));
+                    rc = VERR_INVALID_PARAMETER;
+                    break;
+                }
+            }
+
+            if (!RT_SUCCESS(rc))
+            {
+                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: param validation failed, returning.."));
+                break;
+            }
+
+            crServerVBoxCompositionSetEnableStateGlobal(GL_FALSE);
+
+            rc = crVBoxServerSetScreenViewport((int)paParms[0].u.uint32,
+                    paParms[1].u.uint32, /* x */
+                    paParms[2].u.uint32, /* y */
+                    paParms[3].u.uint32, /* w */
+                    paParms[4].u.uint32  /* h */);
+            if (!RT_SUCCESS(rc))
+            {
+                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: crVBoxServerSetScreenViewport failed, rc %d", rc));
+            }
+
+            crServerVBoxCompositionSetEnableStateGlobal(GL_TRUE);
+
+            break;
+        }
+        case SHCRGL_HOST_FN_VIEWPORT_CHANGED2:
         {
             Log(("svcCall: SHCRGL_HOST_FN_VIEWPORT_CHANGED\n"));

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -936 +936 @@
                 if (pVMMDev)
                 {
+#if 0
                     if (mhCrOglSvc)
                         pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_SCREEN_CHANGED, &parm, NULL, NULL);
                     else
                         AssertMsgFailed(("mhCrOglSvc is NULL\n"));
+#else
+                    pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SCREEN_CHANGED, SHCRGL_CPARMS_SCREEN_CHANGED, &parm);
+#endif
                 }
             }
@@ -2232 +2236 @@
                 if (pVMMDev)
                 {
+#if 0
                     if (mhCrOglSvc)
                         pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_SCREEN_CHANGED, &parm, NULL, NULL);
                     else
                         AssertMsgFailed(("mhCrOglSvc is NULL\n"));
+#else
+                    pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SCREEN_CHANGED, SHCRGL_CPARMS_SCREEN_CHANGED, &parm);
+#endif
                 }
                 /*ComAssertRCRet (vrc, E_FAIL);*/
@@ -3336 +3344 @@
 void Display::crViewportNotify(VMMDev *pVMMDev, ULONG aScreenId, ULONG x, ULONG y, ULONG width, ULONG height)
 {
+#if 0
     VBOXHGCMSVCPARM parm;
 
@@ -3355 +3364 @@
     parm.u.pointer.size = sizeof (*pViewportInfo);
 
-    pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_VIEWPORT_CHANGED, &parm, displayCrAsyncCmdCompletion, this);
-
+    pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_VIEWPORT_CHANGED2, &parm, displayCrAsyncCmdCompletion, this);
+#else
+    VBOXHGCMSVCPARM aParms[5];
+
+    aParms[0].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[0].u.uint32 = aScreenId;
+
+    aParms[1].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[1].u.uint32 = x;
+
+    aParms[2].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[2].u.uint32 = y;
+
+
+    aParms[3].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[3].u.uint32 = width;
+
+    aParms[4].type = VBOX_HGCM_SVC_PARM_32BIT;
+    aParms[4].u.uint32 = height;
+
+    pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_VIEWPORT_CHANGED, SHCRGL_CPARMS_VIEWPORT_CHANGED, aParms);
+#endif
 }
 #endif