From bf19558be57556bb92696827c31c1f0cba035801 Mon Sep 17 00:00:00 2001
From: Jason Macnak <natsu@google.com>
Date: Wed, 20 Nov 2019 16:25:49 -0800
Subject: Makes gpu renderer flags configurable via command line

BUG=b:134086390
TEST=built crosvm and booted cuttlefish locally with gpu

Change-Id: I4d816ddb52a2eadd06088d204d95118289a3f587
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1927873
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
---
 devices/src/virtio/gpu/mod.rs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'devices/src')

diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs
index 637f22b..83031c8 100644
--- a/devices/src/virtio/gpu/mod.rs
+++ b/devices/src/virtio/gpu/mod.rs
@@ -47,11 +47,19 @@ pub const DEFAULT_DISPLAY_HEIGHT: u32 = 1024;
 pub struct GpuParameters {
     pub display_width: u32,
     pub display_height: u32,
+    pub renderer_use_egl: bool,
+    pub renderer_use_gles: bool,
+    pub renderer_use_glx: bool,
+    pub renderer_use_surfaceless: bool,
 }
 
 pub const DEFAULT_GPU_PARAMS: GpuParameters = GpuParameters {
     display_width: DEFAULT_DISPLAY_WIDTH,
     display_height: DEFAULT_DISPLAY_HEIGHT,
+    renderer_use_egl: true,
+    renderer_use_gles: true,
+    renderer_use_glx: false,
+    renderer_use_surfaceless: true,
 };
 
 // First queue is for virtio gpu commands. Second queue is for cursor commands, which we expect
@@ -675,11 +683,12 @@ fn build_backend(
     possible_displays: &[DisplayBackend],
     display_width: u32,
     display_height: u32,
+    renderer_flags: RendererFlags,
     event_devices: Vec<EventDevice>,
     gpu_device_socket: VmMemoryControlRequestSocket,
     pci_bar: Alloc,
 ) -> Option<Backend> {
-    let mut renderer_flags = RendererFlags::default();
+    let mut renderer_flags = renderer_flags;
     let mut display_opt = None;
     for display in possible_displays {
         match display.build() {
@@ -749,6 +758,7 @@ pub struct Gpu {
     display_backends: Vec<DisplayBackend>,
     display_width: u32,
     display_height: u32,
+    renderer_flags: RendererFlags,
     pci_bar: Option<Alloc>,
 }
 
@@ -762,6 +772,12 @@ impl Gpu {
         gpu_parameters: &GpuParameters,
         event_devices: Vec<EventDevice>,
     ) -> Gpu {
+        let renderer_flags = RendererFlags::new()
+            .use_egl(gpu_parameters.renderer_use_egl)
+            .use_gles(gpu_parameters.renderer_use_gles)
+            .use_glx(gpu_parameters.renderer_use_glx)
+            .use_surfaceless(gpu_parameters.renderer_use_surfaceless);
+
         Gpu {
             exit_evt,
             gpu_device_socket,
@@ -774,6 +790,7 @@ impl Gpu {
             display_backends,
             display_width: gpu_parameters.display_width,
             display_height: gpu_parameters.display_height,
+            renderer_flags,
             pci_bar: None,
         }
     }
@@ -894,6 +911,7 @@ impl VirtioDevice for Gpu {
         let display_backends = self.display_backends.clone();
         let display_width = self.display_width;
         let display_height = self.display_height;
+        let renderer_flags = self.renderer_flags;
         let event_devices = self.event_devices.split_off(0);
         if let (Some(gpu_device_socket), Some(pci_bar)) =
             (self.gpu_device_socket.take(), self.pci_bar.take())
@@ -906,6 +924,7 @@ impl VirtioDevice for Gpu {
                             &display_backends,
                             display_width,
                             display_height,
+                            renderer_flags,
                             event_devices,
                             gpu_device_socket,
                             pci_bar,
-- 
cgit 1.4.1