diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-05 19:11:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-05 19:11:22 +0000 |
| commit | 0a4a7bda5ae88e0d66cb1172700e945fd895003a (patch) | |
| tree | 9de275ca14af645491e0aa0586a8fb03bf1f44a9 | |
| parent | b0cab35c202b452ee515e5ae94b7dd2c3d9ee239 (diff) | |
| parent | 6647b908836bba524b36cd5d59ce65e1f195546a (diff) | |
| download | qemu-0a4a7bda5ae88e0d66cb1172700e945fd895003a.tar.gz | |
Merge "Revert "Turn on MoltenVK with -gpu host"" into emu-master-dev
| -rw-r--r-- | android/android-ui/modules/aemu-gl-init/src/android/opengl/emugl_config.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/android/android-ui/modules/aemu-gl-init/src/android/opengl/emugl_config.cpp b/android/android-ui/modules/aemu-gl-init/src/android/opengl/emugl_config.cpp index 653b275f3f..aa264f1e6f 100644 --- a/android/android-ui/modules/aemu-gl-init/src/android/opengl/emugl_config.cpp +++ b/android/android-ui/modules/aemu-gl-init/src/android/opengl/emugl_config.cpp @@ -479,13 +479,8 @@ bool emuglConfig_init(EmuglConfig* config, bitness = System::get()->getProgramBitness(); } -#ifdef __APPLE__ - if (!strcmp("host", gpu_mode)) { - use_host_vulkan = true; - } -#endif - config->bitness = bitness; + config->use_host_vulkan = use_host_vulkan; resetBackendList(bitness); // For GPU mode in software rendering: @@ -589,9 +584,6 @@ bool emuglConfig_init(EmuglConfig* config, break; case WINSYS_GLESBACKEND_PREFERENCE_NATIVEGL: gpu_mode = "host"; -#ifdef __APPLE__ - use_host_vulkan = true; -#endif break; default: gpu_mode = "host"; @@ -601,9 +593,6 @@ bool emuglConfig_init(EmuglConfig* config, __func__, gpu_mode, uiPreferredBackend); } } - - config->use_host_vulkan = use_host_vulkan; - // b/328275986: Turn off ANGLE because it breaks. if (!strcmp("angle", gpu_mode) || !strcmp("angle_indirect", gpu_mode) || !strcmp("angle9", gpu_mode) || !strcmp("angle9_indirect", gpu_mode)) { |