diff options
| author | Chia-I Wu <olv@google.com> | 2021-04-12 09:36:08 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-17 03:02:59 +0000 |
| commit | 0beb246d8e9d883f1cbb868ca458a07aedf076d1 (patch) | |
| tree | eb14e77686484ef745ec8c13893a941d886a96a0 | |
| parent | 2a5e5794dd40c3ce357d771b46feb4060bc9daac (diff) | |
| download | crosvm-0beb246d8e9d883f1cbb868ca458a07aedf076d1.tar.gz | |
devices: rename gfxstream_support_vulkan to use_vulkan
BUG=b:178104043
TEST=cargo build
Change-Id: Iefb316c41b8e485af3243e54b66ac7cd46ee7733
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2823011
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Chia-I Wu <olv@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
Commit-Queue: Chia-I Wu <olv@google.com>
| -rw-r--r-- | devices/src/virtio/gpu/mod.rs | 6 | ||||
| -rw-r--r-- | rutabaga_gfx/src/rutabaga_utils.rs | 2 | ||||
| -rw-r--r-- | src/main.rs | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs index d9f9c704c..816911892 100644 --- a/devices/src/virtio/gpu/mod.rs +++ b/devices/src/virtio/gpu/mod.rs @@ -70,7 +70,7 @@ pub struct GpuParameters { pub renderer_use_surfaceless: bool, pub gfxstream_use_guest_angle: bool, pub gfxstream_use_syncfd: bool, - pub gfxstream_support_vulkan: bool, + pub use_vulkan: bool, pub udmabuf: bool, pub mode: GpuMode, pub cache_path: Option<String>, @@ -97,7 +97,7 @@ impl Default for GpuParameters { renderer_use_surfaceless: true, gfxstream_use_guest_angle: false, gfxstream_use_syncfd: true, - gfxstream_support_vulkan: true, + use_vulkan: true, mode: GpuMode::Mode3D, cache_path: None, cache_size: None, @@ -917,7 +917,7 @@ impl Gpu { .use_surfaceless(gpu_parameters.renderer_use_surfaceless) .use_guest_angle(gpu_parameters.gfxstream_use_guest_angle) .use_syncfd(gpu_parameters.gfxstream_use_syncfd) - .support_vulkan(gpu_parameters.gfxstream_support_vulkan); + .use_vulkan(gpu_parameters.use_vulkan); let mut rutabaga_channels: Vec<RutabagaChannel> = Vec::new(); for (channel_name, path) in &channels { diff --git a/rutabaga_gfx/src/rutabaga_utils.rs b/rutabaga_gfx/src/rutabaga_utils.rs index 8a99f4e16..06f6fe7d6 100644 --- a/rutabaga_gfx/src/rutabaga_utils.rs +++ b/rutabaga_gfx/src/rutabaga_utils.rs @@ -400,7 +400,7 @@ impl GfxstreamFlags { } /// Support using Vulkan. - pub fn support_vulkan(self, v: bool) -> GfxstreamFlags { + pub fn use_vulkan(self, v: bool) -> GfxstreamFlags { self.set_flag(GFXSTREAM_RENDERER_FLAGS_NO_VK_BIT, !v) } diff --git a/src/main.rs b/src/main.rs index bd047e6b6..30c30e4aa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -305,10 +305,10 @@ fn parse_gpu_options(s: Option<&str>) -> argument::Result<GpuParameters> { vulkan_specified = true; match v { "true" | "" => { - gpu_params.gfxstream_support_vulkan = true; + gpu_params.use_vulkan = true; } "false" => { - gpu_params.gfxstream_support_vulkan = false; + gpu_params.use_vulkan = false; } _ => { return Err(argument::Error::InvalidValue { @@ -2802,22 +2802,22 @@ mod tests { assert!( parse_gpu_options(Some("backend=gfxstream,vulkan=true")) .unwrap() - .gfxstream_support_vulkan + .use_vulkan ); assert!( parse_gpu_options(Some("vulkan=true,backend=gfxstream")) .unwrap() - .gfxstream_support_vulkan + .use_vulkan ); assert!( !parse_gpu_options(Some("backend=gfxstream,vulkan=false")) .unwrap() - .gfxstream_support_vulkan + .use_vulkan ); assert!( !parse_gpu_options(Some("vulkan=false,backend=gfxstream")) .unwrap() - .gfxstream_support_vulkan + .use_vulkan ); assert!(parse_gpu_options(Some("backend=gfxstream,vulkan=invalid_value")).is_err()); assert!(parse_gpu_options(Some("vulkan=invalid_value,backend=gfxstream")).is_err()); |