diff options
| author | Alistair Delva <adelva@google.com> | 2022-07-19 12:04:49 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2022-08-30 20:45:13 +0000 |
| commit | bf1a8e0fe4f924457d39111f8f01b7d1860286d6 (patch) | |
| tree | b539c15dfd78681709a08c10cc309450217ed880 | |
| parent | fc5df07e98690d98d897ce06e36e07dba88bb144 (diff) | |
| download | cuttlefish-bf1a8e0fe4f924457d39111f8f01b7d1860286d6.tar.gz | |
Make sure androidboot.opengles.version is set
This property should always be set, and sometimes wasn't. Since we are
using an ancient MESA, just be conservative with drm_virgl and assume
only 3.0 support.
Bug: 216827224
Change-Id: I082a9f87d5deafca1aa983d8042159013c15b510
| -rw-r--r-- | host/libs/vm_manager/crosvm_manager.cpp | 3 | ||||
| -rw-r--r-- | host/libs/vm_manager/qemu_manager.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp index bf95250f5..765fa3e36 100644 --- a/host/libs/vm_manager/crosvm_manager.cpp +++ b/host/libs/vm_manager/crosvm_manager.cpp @@ -79,7 +79,8 @@ std::vector<std::string> CrosvmManager::ConfigureGraphics( "androidboot.hardware.gralloc=minigbm", "androidboot.hardware.hwcomposer=drm", "androidboot.hardware.egl=mesa", - }; + // No "hardware" Vulkan support, yet + "androidboot.opengles.version=196608"}; // OpenGL ES 3.0 } if (config.gpu_mode() == kGpuModeGfxStream) { std::string gles_impl = config.enable_gpu_angle() ? "angle" : "emulation"; diff --git a/host/libs/vm_manager/qemu_manager.cpp b/host/libs/vm_manager/qemu_manager.cpp index adedf0499..068070347 100644 --- a/host/libs/vm_manager/qemu_manager.cpp +++ b/host/libs/vm_manager/qemu_manager.cpp @@ -136,7 +136,7 @@ std::vector<std::string> QemuManager::ConfigureGraphics( "androidboot.hardware.hwcomposer=" + config.hwcomposer(), "androidboot.hardware.egl=angle", "androidboot.hardware.vulkan=pastel", - }; + "androidboot.opengles.version=196609"}; // OpenGL ES 3.1 } if (config.gpu_mode() == kGpuModeDrmVirgl) { @@ -145,7 +145,8 @@ std::vector<std::string> QemuManager::ConfigureGraphics( "androidboot.hardware.gralloc=minigbm", "androidboot.hardware.hwcomposer=drm", "androidboot.hardware.egl=mesa", - }; + // No "hardware" Vulkan support, yet + "androidboot.opengles.version=196608"}; // OpenGL ES 3.0 } return {}; |