Changeset 22145 in vbox

Timestamp:

Aug 10, 2009 8:02:17 PM (15 years ago)

Author:

vboxsync

Message:

video hw accel: expose to vboxmanage

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -53 +53 @@
  VBoxManage_DEFS += VBOX_WITH_NETFLT
 endif
+ifdef VBOX_WITH_VIDEOHWACCEL
+ VBoxManage_DEFS += VBOX_WITH_VIDEOHWACCEL
+endif
  VBoxManage_SOURCES = \
         VBoxManage.cpp \

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -137 +137 @@
                  "                            [--monitorcount <number>]\n"
                  "                            [--accelerate3d <on|off>]\n"
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                 "                            [--accelerate2dvideo <on|off>]\n"
+#endif
                  "                            [--bioslogofadein on|off]\n"
                  "                            [--bioslogofadeout on|off]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -429 +429 @@
     else
         RTPrintf("3D Acceleration: %s\n", accelerate3d ? "on" : "off");
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    BOOL accelerate2dVideo;
+    machine->COMGETTER(Accelerate2DVideoEnabled)(&accelerate2dVideo);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("accelerate2dvideo=\"%s\"\n", accelerate2dVideo ? "on" : "off");
+    else
+        RTPrintf("2D Video Acceleration: %s\n", accelerate2dVideo ? "on" : "off");
+#endif
 
     ComPtr<IFloppyDrive> floppyDrive;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -70 +70 @@
     uint32_t monitorcount = ~0;
     char *accelerate3d = NULL;
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    char *accelerate2dvideo = NULL;
+#endif
     char *bioslogofadein = NULL;
     char *bioslogofadeout = NULL;
@@ -247 +250 @@
             accelerate3d = a->argv[i];
         }
+#ifdef VBOX_WITH_VIDEOHWACCEL
+        else if (   !strcmp(a->argv[i], "--accelerate2dvideo")
+                 || !strcmp(a->argv[i], "-accelerate2dvideo"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            accelerate2dvideo = a->argv[i];
+        }
+#endif
         else if (   !strcmp(a->argv[i], "--bioslogofadein")
                  || !strcmp(a->argv[i], "-bioslogofadein"))
@@ -1022 +1035 @@
             else
             {
-                errorArgument("Invalid --accelerate3d argument '%s'", ioapic);
+                errorArgument("Invalid --accelerate3d argument '%s'", accelerate3d);
                 rc = E_FAIL;
                 break;
             }
         }
+#ifdef VBOX_WITH_VIDEOHWACCEL
+        if (accelerate2dvideo)
+        {
+            if (!strcmp(accelerate2dvideo, "on"))
+            {
+                CHECK_ERROR(machine, COMSETTER(Accelerate2DVideoEnabled)(true));
+            }
+            else if (!strcmp(accelerate2dvideo, "off"))
+            {
+                CHECK_ERROR(machine, COMSETTER(Accelerate2DVideoEnabled)(false));
+            }
+            else
+            {
+                errorArgument("Invalid --accelerate2dvideo argument '%s'", accelerate2dvideo);
+                rc = E_FAIL;
+                break;
+            }
+        }
+#endif
         if (bioslogofadein)
         {