devices: rename GpuMode::Mode3D to GpuMode::ModeVirglRenderer

BUG=b:178104043
TEST=cargo build

Change-Id: I0e549dbaf7e804e4a40104426ce58637b478fac2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2827237
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: Chia-I Wu <olv@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Chia-I Wu <olv@google.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs
index 816911892..55ecbe94c 100644
--- a/devices/src/virtio/gpu/mod.rs
+++ b/devices/src/virtio/gpu/mod.rs
@@ -56,7 +56,7 @@ pub const DEFAULT_DISPLAY_HEIGHT: u32 = 1024;
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum GpuMode {
     Mode2D,
-    Mode3D,
+    ModeVirglRenderer,
     ModeGfxstream,
 }
 
@@ -98,7 +98,7 @@ impl Default for GpuParameters {
             gfxstream_use_guest_angle: false,
             gfxstream_use_syncfd: true,
             use_vulkan: true,
-            mode: GpuMode::Mode3D,
+            mode: GpuMode::ModeVirglRenderer,
             cache_path: None,
             cache_size: None,
             udmabuf: false,
@@ -937,7 +937,7 @@ impl Gpu {
         let rutabaga_channels_opt = Some(rutabaga_channels);
         let component = match gpu_parameters.mode {
             GpuMode::Mode2D => RutabagaComponentType::Rutabaga2D,
-            GpuMode::Mode3D => RutabagaComponentType::VirglRenderer,
+            GpuMode::ModeVirglRenderer => RutabagaComponentType::VirglRenderer,
             GpuMode::ModeGfxstream => RutabagaComponentType::Gfxstream,
         };
 
diff --git a/src/main.rs b/src/main.rs
index 30c30e4aa..6ae5856e0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -172,12 +172,12 @@ fn parse_gpu_options(s: Option<&str>) -> argument::Result<GpuParameters> {
         for (k, v) in opts {
             match k {
                 // Deprecated: Specifying --gpu=<mode> Not great as the mode can be set multiple
-                // times if the user specifies several modes (--gpu=2d,3d,gfxstream)
+                // times if the user specifies several modes (--gpu=2d,virglrenderer,gfxstream)
                 "2d" | "2D" => {
                     gpu_params.mode = GpuMode::Mode2D;
                 }
-                "3d" | "3D" => {
-                    gpu_params.mode = GpuMode::Mode3D;
+                "3d" | "3D" | "virglrenderer" => {
+                    gpu_params.mode = GpuMode::ModeVirglRenderer;
                 }
                 #[cfg(feature = "gfxstream")]
                 "gfxstream" => {
@@ -188,8 +188,8 @@ fn parse_gpu_options(s: Option<&str>) -> argument::Result<GpuParameters> {
                     "2d" | "2D" => {
                         gpu_params.mode = GpuMode::Mode2D;
                     }
-                    "3d" | "3D" => {
-                        gpu_params.mode = GpuMode::Mode3D;
+                    "3d" | "3D" | "virglrenderer" => {
+                        gpu_params.mode = GpuMode::ModeVirglRenderer;
                     }
                     #[cfg(feature = "gfxstream")]
                     "gfxstream" => {
@@ -199,7 +199,7 @@ fn parse_gpu_options(s: Option<&str>) -> argument::Result<GpuParameters> {
                         return Err(argument::Error::InvalidValue {
                             value: v.to_string(),
                             expected: String::from(
-                                "gpu parameter 'backend' should be one of (2d|3d|gfxstream)",
+                                "gpu parameter 'backend' should be one of (2d|virglrenderer|gfxstream)",
                             ),
                         });
                     }
@@ -1914,13 +1914,13 @@ writeback=BOOL - Indicates whether the VM can use writeback caching (default: fa
                                   "[width=INT,height=INT]",
                                   "(EXPERIMENTAL) Comma separated key=value pairs for setting up a virtio-gpu device
                                   Possible key values:
-                                  backend=(2d|3d|gfxstream) - Which backend to use for virtio-gpu (determining rendering protocol)
+                                  backend=(2d|virglrenderer|gfxstream) - Which backend to use for virtio-gpu (determining rendering protocol)
                                   width=INT - The width of the virtual display connected to the virtio-gpu.
                                   height=INT - The height of the virtual display connected to the virtio-gpu.
-                                  egl[=true|=false] - If the virtio-gpu backend should use a EGL context for rendering.
-                                  glx[=true|=false] - If the virtio-gpu backend should use a GLX context for rendering.
-                                  surfaceless[=true|=false] - If the virtio-gpu backend should use a surfaceless context for rendering.
-                                  angle[=true|=false] - If the guest is using ANGLE (OpenGL on Vulkan) as its native OpenGL driver.
+                                  egl[=true|=false] - If the backend should use a EGL context for rendering.
+                                  glx[=true|=false] - If the backend should use a GLX context for rendering.
+                                  surfaceless[=true|=false] - If the backend should use a surfaceless context for rendering.
+                                  angle[=true|=false] - If the gfxstream backend should use ANGLE (OpenGL on Vulkan) as its native OpenGL driver.
                                   syncfd[=true|=false] - If the gfxstream backend should support EGL_ANDROID_native_fence_sync
                                   vulkan[=true|=false] - If the gfxstream backend should support vulkan
                                   "),
@@ -2860,8 +2860,8 @@ mod tests {
     #[cfg(all(feature = "gpu", feature = "gfxstream"))]
     #[test]
     fn parse_gpu_options_not_gfxstream_with_syncfd_specified() {
-        assert!(parse_gpu_options(Some("backend=3d,syncfd=true")).is_err());
-        assert!(parse_gpu_options(Some("syncfd=true,backend=3d")).is_err());
+        assert!(parse_gpu_options(Some("backend=virglrenderer,syncfd=true")).is_err());
+        assert!(parse_gpu_options(Some("syncfd=true,backend=virglrenderer")).is_err());
     }
 
     #[test]