diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-18 22:16:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-11-18 22:16:15 +0000 |
| commit | 73cdaad35d5117e88a109878e6e8e2c59dd3ef3f (patch) | |
| tree | a549306605b8570652ace8351d3813017c83f532 | |
| parent | e9c0dd352f25e862e9b2ae16e999bb7012b0b234 (diff) | |
| parent | 147eba9d88f7ad6f676f3657f2ec892026fafbe6 (diff) | |
| download | qemu-snap-temp-L36300000957431299.tar.gz | |
Merge "resolve Coastguard cherrypick merge conflict for change: 2309834" into snap-temp-L36300000957431299snap-temp-L36300000957431299
| -rw-r--r-- | android/android-emu/android/opengl/emugl_config.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/android-emu/android/opengl/emugl_config.cpp b/android/android-emu/android/opengl/emugl_config.cpp index 93c1957801..0e961793fb 100644 --- a/android/android-emu/android/opengl/emugl_config.cpp +++ b/android/android-emu/android/opengl/emugl_config.cpp @@ -311,6 +311,7 @@ bool emuglConfig_init(EmuglConfig* config, } D("%s: 'swiftshader_indirect' mode auto-selected\n", __FUNCTION__); gpu_mode = "swiftshader_indirect"; + setCurrentRenderer(gpu_mode); } else if (!has_auto_no_window && (no_window || (blacklisted && !hasUiPreference))) { if (stringVectorContains(sBackendList->names(), "swiftshader")) { @@ -415,7 +416,9 @@ void emuglConfig_setupEnv(const EmuglConfig* config) { } else #ifndef __APPLE__ // Default to swiftshader vk on mac - if (sCurrentRenderer == SELECTED_RENDERER_SWIFTSHADER_INDIRECT) + if (sCurrentRenderer == SELECTED_RENDERER_SWIFTSHADER_INDIRECT + || sCurrentRenderer == SELECTED_RENDERER_SWIFTSHADER + || strstr(config->backend, "swangle")) #endif { // Use Swiftshader vk icd if using swiftshader_indirect |