Changeset 14317 in vbox

Timestamp:

Nov 18, 2008 4:50:15 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: use accelerate3d property instead of extradata

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)
• VMMDevInterface.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -45 +45 @@
 #include <VBox/version.h>
 #include <VBox/HostServices/VBoxClipboardSvc.h>
+#ifdef VBOX_WITH_CROGL
+#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+#endif
 #ifdef VBOX_WITH_GUEST_PROPS
 # include <VBox/HostServices/GuestPropertySvc.h>
@@ -1763 +1766 @@
         }
     }
+
+#ifdef VBOX_WITH_CROGL
+    /*
+     * crOpenGL
+     */
+    {
+        BOOL fEnabled = false;
+        hrc = pMachine->COMGETTER(Accelerate3DEnabled) (&fEnabled);                               H();
+
+        if (fEnabled)
+        {
+            /* Load the service */
+            rc = pConsole->mVMMDev->hgcmLoadService ("VBoxSharedCrOpenGL", "VBoxSharedCrOpenGL");
+            if (RT_FAILURE(rc))
+            {
+                LogRel(("Failed to load Shared OpenGL service %Rrc\n", rc));
+                /* That is not a fatal failure. */
+                rc = VINF_SUCCESS;
+            }
+            else
+            {
+                LogRel(("Shared crOpenGL service loaded.\n"));
+
+                /* Setup the service. */
+                VBOXHGCMSVCPARM parm;
+                parm.type = VBOX_HGCM_SVC_PARM_PTR;
+
+                //parm.u.pointer.addr = static_cast <IConsole *> (pData->pVMMDev->getParent());
+                parm.u.pointer.addr = pConsole->mVMMDev->getParent()->getDisplay()->getFramebuffer();
+                parm.u.pointer.size = sizeof(IFramebuffer *);
+
+                rc = pConsole->mVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_FRAMEBUFFER, 1, &parm);
+                if (!RT_SUCCESS(rc))
+                    AssertMsgFailed(("SHCRGL_HOST_FN_SET_FRAMEBUFFER failed with %Rrc\n", rc));
+                }
+        }
+    }
+#endif
+
 #ifdef VBOX_WITH_GUEST_PROPS
     /*

trunk/src/VBox/Main/Makefile.kmk

@@ -68 +68 @@
 ifdef VBOX_WITH_NETFLT
  VBOX_MAIN_DEFS += VBOX_WITH_NETFLT
+endif
+ifdef VBOX_WITH_CROGL
+ VBOX_MAIN_DEFS += VBOX_WITH_CROGL
 endif
 ifdef VBOX_WITH_GUEST_PROPS

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -36 +36 @@
 #include "hgcm/HGCM.h"
 #include "hgcm/HGCMObjects.h"
-#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
 #endif
 
@@ -815 +814 @@
         {
             LogRel(("Failed to load Shared OpenGL service %Rrc\n", rc));
-        }
-    }
-
-    rc = CFGMR3QueryBool(pCfgHandle, "crOpenGLEnabled", &fEnabled);
-    if ( RT_SUCCESS(rc) &&  fEnabled)
-    {
-        rc = pData->pVMMDev->hgcmLoadService ("VBoxSharedCrOpenGL", "VBoxSharedCrOpenGL");
-        if (RT_SUCCESS(rc))
-        {
-            LogRel(("Shared Chromium OpenGL service loaded.\n"));
-
-            /* Setup the service. */
-            VBOXHGCMSVCPARM parm;
-            parm.type = VBOX_HGCM_SVC_PARM_PTR;
-
-            //parm.u.pointer.addr = static_cast <IConsole *> (pData->pVMMDev->getParent());
-            parm.u.pointer.addr = pData->pVMMDev->getParent()->getDisplay()->getFramebuffer();
-            parm.u.pointer.size = sizeof(IFramebuffer *);
-
-            rc = HGCMHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_FRAMEBUFFER, 1, &parm);
-            if (!RT_SUCCESS(rc))
-                AssertMsgFailed(("SHCRGL_HOST_FN_SET_FRAMEBUFFER failed with %Rrc\n", rc));
-        }
-        else
-        {
-            LogRel(("Failed to load Shared Chromium OpenGL service %Rrc\n", rc));
         }
     }