Changeset 53730 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jan 4, 2015 5:22:09 AM (10 years ago)

Author:

vboxsync

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

97508

Message:

DisplayImpl.cpp: VMSVGA3d does not use the mCrOglCallbacks.

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (6 diffs)

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

@@ -308 +308 @@
         BOOL is3denabled;
         that->mParent->i_machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
-        if (is3denabled && that->mCrOglCallbacks.pfnHasData())
+        if (   is3denabled
+            && that->mCrOglCallbacks.pfnHasData
+            && that->mCrOglCallbacks.pfnHasData())
         {
             VMMDev *pVMMDev = that->mParent->i_getVMMDev();
@@ -735 +737 @@
     if (!mhCrOglSvc)
     {
-        /* no 3D */
-#ifdef DEBUG
-        BOOL is3denabled;
-        mParent->i_machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
-        Assert(!is3denabled);
+        /* no 3D or the VMSVGA3d kind. */
+#ifdef VBOX_STRICT
+        BOOL fIs3DEnabled;
+        mParent->i_machine()->COMGETTER(Accelerate3DEnabled)(&fIs3DEnabled);
+        GraphicsControllerType_T enmGraphicsController;
+        mParent->i_machine()->COMGETTER(GraphicsControllerType)(&enmGraphicsController);
+        Assert(!fIs3DEnabled || enmGraphicsController != GraphicsControllerType_VBoxVGA);
 #endif
         return VERR_INVALID_STATE;
@@ -1233 +1237 @@
         if (mhCrOglSvc)
         {
-            VBOXCRCMDCTL_HGCM *pCtl = (VBOXCRCMDCTL_HGCM*)RTMemAlloc(RT_MAX(cRect, 1) * sizeof(RTRECT)
-                    + sizeof(VBOXCRCMDCTL_HGCM));
+            VBOXCRCMDCTL_HGCM *pCtl;
+            pCtl = (VBOXCRCMDCTL_HGCM*)RTMemAlloc(RT_MAX(cRect, 1) * sizeof(RTRECT) + sizeof(VBOXCRCMDCTL_HGCM));
             if (pCtl)
             {
@@ -1775 +1779 @@
     BOOL is3denabled;
     pDisplay->mParent->i_machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
-    if (is3denabled && pDisplay->mCrOglCallbacks.pfnHasData())
+    if (   is3denabled
+        && pDisplay->mCrOglCallbacks.pfnHasData
+        && pDisplay->mCrOglCallbacks.pfnHasData())
     {
         VMMDev *pVMMDev = pDisplay->mParent->i_getVMMDev();
@@ -2979 +2985 @@
                 if (ASMAtomicCmpXchgU32(&pDisplay->mfCrOglVideoRecState, CRVREC_STATE_SUBMITTED, CRVREC_STATE_IDLE))
                 {
-                    if (pDisplay->mCrOglCallbacks.pfnHasData())
+                    if (   pDisplay->mCrOglCallbacks.pfnHasData
+                        && pDisplay->mCrOglCallbacks.pfnHasData())
                     {
                         /* submit */
@@ -3382 +3389 @@
     AssertRCReturn(rc, rc);
 
-    if (mCrOglCallbacks.pfnHasDataForScreen && mCrOglCallbacks.pfnHasDataForScreen(u32ScreenID))
+    if (   mCrOglCallbacks.pfnHasDataForScreen
+        && mCrOglCallbacks.pfnHasDataForScreen(u32ScreenID))
         rc = i_crCtlSubmitSync(pCmd, cbCmd);
     else