mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: respect --gpu vulkan=true in GpuMode::ModeVirglRenderer

Browse source 
BUG=b:178104043
TEST=vkcube

Change-Id: I289612f567ddd8221b498de739c18454cb3d9e7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2823013
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Chia-I Wu <olv@google.com>
Commit-Queue: Chia-I Wu <olv@google.com>
This commit is contained in:
Chia-I Wu 2021-04-12 10:14:24 -07:00 committed by Commit Bot
parent 91df656291
commit 6d473b3615
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devices/src/virtio/gpu/mod.rs
View file

@ -909,7 +909,8 @@ impl Gpu {
.use_gles(gpu_parameters.renderer_use_gles)
.use_glx(gpu_parameters.renderer_use_glx)
.use_surfaceless(gpu_parameters.renderer_use_surfaceless)
.use_external_blob(external_blob);
.use_external_blob(external_blob)
.use_venus(gpu_parameters.use_vulkan);
let gfxstream_flags = GfxstreamFlags::new()
.use_egl(gpu_parameters.renderer_use_egl)
.use_gles(gpu_parameters.renderer_use_gles)

49
src/main.rs
View file

@ -300,9 +300,11 @@ fn parse_gpu_options(s: Option<&str>) -> argument::Result<GpuParameters> {
}
}
}
#[cfg(feature = "gfxstream")]
"vulkan" => {
vulkan_specified = true;
#[cfg(feature = "gfxstream")]
{
vulkan_specified = true;
}
match v {
"true" | "" => {
gpu_params.use_vulkan = true;
@ -373,12 +375,12 @@ fn parse_gpu_options(s: Option<&str>) -> argument::Result<GpuParameters> {
gpu_params.use_vulkan = true;
}
if vulkan_specified || syncfd_specified || angle_specified {
if syncfd_specified || angle_specified {
match gpu_params.mode {
GpuMode::ModeGfxstream => {}
_ => {
return Err(argument::Error::UnknownArgument(
"gpu parameter vulkan and syncfd are only supported for gfxstream backend"
"gpu parameter syncfd and angle are only supported for gfxstream backend"
.to_string(),
));
}
@ -1926,7 +1928,7 @@ writeback=BOOL - Indicates whether the VM can use writeback caching (default: fa
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
vulkan[=true|=false] - If the backend should support vulkan
"),
#[cfg(feature = "tpm")]
Argument::flag("software-tpm", "enable a software emulated trusted platform module device"),
@ -2800,7 +2802,7 @@ mod tests {
);
}
#[cfg(all(feature = "gpu", feature = "gfxstream"))]
#[cfg(feature = "gpu")]
#[test]
fn parse_gpu_options_default_vulkan_support() {
assert!(
@ -2808,6 +2810,8 @@ mod tests {
.unwrap()
.use_vulkan
);
#[cfg(feature = "gfxstream")]
assert!(
parse_gpu_options(Some("backend=gfxstream"))
.unwrap()
@ -2815,38 +2819,33 @@ mod tests {
);
}
#[cfg(all(feature = "gpu", feature = "gfxstream"))]
#[cfg(feature = "gpu")]
#[test]
fn parse_gpu_options_gfxstream_with_vulkan_specified() {
fn parse_gpu_options_with_vulkan_specified() {
assert!(parse_gpu_options(Some("vulkan=true")).unwrap().use_vulkan);
assert!(
parse_gpu_options(Some("backend=gfxstream,vulkan=true"))
parse_gpu_options(Some("backend=virglrenderer,vulkan=true"))
.unwrap()
.use_vulkan
);
assert!(
parse_gpu_options(Some("vulkan=true,backend=gfxstream"))
parse_gpu_options(Some("vulkan=true,backend=virglrenderer"))
.unwrap()
.use_vulkan
);
assert!(!parse_gpu_options(Some("vulkan=false")).unwrap().use_vulkan);
assert!(
!parse_gpu_options(Some("backend=virglrenderer,vulkan=false"))
.unwrap()
.use_vulkan
);
assert!(
!parse_gpu_options(Some("backend=gfxstream,vulkan=false"))
!parse_gpu_options(Some("vulkan=false,backend=virglrenderer"))
.unwrap()
.use_vulkan
);
assert!(
!parse_gpu_options(Some("vulkan=false,backend=gfxstream"))
.unwrap()
.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());
}
#[cfg(all(feature = "gpu", feature = "gfxstream"))]
#[test]
fn parse_gpu_options_not_gfxstream_with_vulkan_specified() {
assert!(parse_gpu_options(Some("backend=3d,vulkan=true")).is_err());
assert!(parse_gpu_options(Some("vulkan=true,backend=3d")).is_err());
assert!(parse_gpu_options(Some("backend=virglrenderer,vulkan=invalid_value")).is_err());
assert!(parse_gpu_options(Some("vulkan=invalid_value,backend=virglrenderer")).is_err());
}
#[cfg(all(feature = "gpu", feature = "gfxstream"))]