Changeset 13962 in vbox

Timestamp:

Nov 7, 2008 2:53:32 PM (16 years ago)

Author:

vboxsync

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

38997

Message:

Added Accelerate3D xml setting and IMachine property.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (5 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• xml/VirtualBox-settings-common.xsd (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -192 +192 @@
     mStatisticsUpdateInterval = 0;
     mVRAMSize = 8;
+    mAccelerate3DEnabled = false;
     mMonitorCount = 1;
     mHWVirtExEnabled = TSBool_False;
@@ -222 +223 @@
         mStatisticsUpdateInterval != that.mStatisticsUpdateInterval ||
         mVRAMSize != that.mVRAMSize ||
+        mAccelerate3DEnabled != that.mAccelerate3DEnabled ||
         mMonitorCount != that.mMonitorCount ||
         mHWVirtExEnabled != that.mHWVirtExEnabled ||
@@ -1082 +1084 @@
     mHWData.backup();
     mHWData->mStatisticsUpdateInterval = statisticsUpdateInterval;
+
+    return S_OK;
+}
+
+
+STDMETHODIMP Machine::COMGETTER(Accelerate3DEnabled)(BOOL *enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    *enabled = mHWData->mAccelerate3DEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(Accelerate3DEnabled)(BOOL enable)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    /** @todo check validity! */
+
+    mHWData.backup();
+    mHWData->mAccelerate3DEnabled = enable;
 
     return S_OK;
@@ -5038 +5074 @@
         mHWData->mVRAMSize = displayNode.value <ULONG> ("VRAMSize");
         mHWData->mMonitorCount = displayNode.value <ULONG> ("MonitorCount");
+
+        /* Accelerate3DEnabled (optional, default is false) */
+        Key Accelerate3DNode = displayNode.findKey ("Accelerate3D");
+        if (!Accelerate3DNode.isNull())
+            mHWData->mAccelerate3DEnabled = Accelerate3DNode.value <bool> ("enabled");
     }
 
@@ -6405 +6446 @@
         displayNode.setValue <ULONG> ("VRAMSize", mHWData->mVRAMSize);
         displayNode.setValue <ULONG> ("MonitorCount", mHWData->mMonitorCount);
+        displayNode.setValue <bool> ("Accelerate3D", mHWData->mAccelerate3DEnabled);
     }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2536 +2536 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="b5d1baca-da5b-4202-905f-ee53a5f60ae5"
+     uuid="a744b229-3457-422f-8550-649c40346c55"
      wsmap="managed"
      >
@@ -2738 +2738 @@
     <attribute name="VRAMSize" type="unsigned long">
       <desc>Video memory size in megabytes.</desc>
+    </attribute>
+
+    <attribute name="Accelerate3DEnabled" type="boolean" default="false">
+      <desc>
+        This setting determines whether VirtualBox allows guests make use
+        of the 3D graphics support available on the host. Currently limited
+        to OpenGL only. </desc>
     </attribute>
 

trunk/src/VBox/Main/include/MachineImpl.h

@@ -258 +258 @@
         BOOL           mHWVirtExNestedPagingEnabled;
         BOOL           mHWVirtExVPIDEnabled;
+        BOOL           mAccelerate3DEnabled;
         BOOL           mPAEEnabled;
         ULONG          mCPUCount;
@@ -485 +486 @@
     STDMETHOD(COMGETTER(MonitorCount))(ULONG *monitorCount);
     STDMETHOD(COMSETTER(MonitorCount))(ULONG monitorCount);
+    STDMETHOD(COMGETTER(Accelerate3DEnabled))(BOOL *enabled);
+    STDMETHOD(COMSETTER(Accelerate3DEnabled))(BOOL enabled);
     STDMETHOD(COMGETTER(BIOSSettings))(IBIOSSettings **biosSettings);
     STDMETHOD(COMGETTER(HWVirtExEnabled))(TSBool_T *enabled);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -431 +431 @@
 </xsd:complexType>
 
+<xsd:complexType name="TAccelerate3DType">
+  <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
+</xsd:complexType>
+
 <xsd:complexType name="TDisplay">
   <xsd:attribute name="VRAMSize" use="required">
@@ -447 +451 @@
     </xsd:simpleType>
   </xsd:attribute>
+  <xsd:attribute name="Accelerate3D" type="TAccelerate3DType" minOccurs="0"/>
 </xsd:complexType>