Merge "Merge cherrypicks of ['aosp/2263409', 'aosp/2396032'] into emu-32-release." into emu-32-releasesnap-temp-L34500000958348600

2 files changed, 29 insertions, 14 deletions

diff --git a/android/android-emu/android/skin/qt/images/all/androidstudio.svg b/android/android-emu/android/skin/qt/images/all/androidstudio.svg
index 940145d52e..d9ba5e2e25 100644
--- a/android/android-emu/android/skin/qt/images/all/androidstudio.svg
+++ b/android/android-emu/android/skin/qt/images/all/androidstudio.svg
@@ -1 +1,17 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="31.677%" y1="34.912%" x2="78.46%" y2="88.594%" id="a"><stop stop-color="#E6E6E6" offset="0%"/><stop stop-color="#FFF" stop-opacity="0" offset="92.575%"/></linearGradient></defs><g transform="translate(6.5 6)" fill-rule="nonzero" fill="none"><ellipse fill="#000" opacity=".2" cx="57.54" cy="58.396" rx="57.54" ry="57.475"/><ellipse fill="#FFF" cx="57.54" cy="57.475" rx="57.54" ry="57.475"/><path d="M114.59 64.987L68.636 19.084l-37.02 60.613 34.637 34.598c25.198-3.824 45.026-23.972 48.337-49.308z" fill="#FFF"/><path d="M83.058 46.114L37.104.211.085 60.824l34.637 34.598c25.197-3.824 45.025-23.972 48.336-49.308z" fill="url(#a)" transform="translate(31.532 18.873)"/><path d="M79.185 41.314h-2.246c-.521-6.21-4.074-11.467-9.266-14.292l-1.128-.563c-2.342-1.069-4.973-1.664-7.78-1.664-2.807 0-5.438.595-7.78 1.664l-.01-.016c-.387.172-.777.334-1.174.483l.056.096a17.836 17.836 0 0 0-3.686 2.666h-10.5c-3.196 0-5.812 2.616-5.812 5.813 0 .078.002.156.005.234-.011-.16-.011-.252-.011-.252v40.175c0 3.198 2.616 5.814 5.813 5.814h10.187l-2.502 5.33c-.878 1.885.498 4.044 2.577 4.044a2.843 2.843 0 0 0 2.578-1.643l3.618-7.731h13.118l3.67 7.626a2.84 2.84 0 0 0 2.558 1.606c2.093 0 3.468-2.188 2.56-4.074l-2.476-5.158h8.156l-.014 8.992c0 .16.13.29.29.29l2.46.013c2.877 0 5.231-2.354 5.231-5.23v-38.62c0-6.333-8.492-5.603-8.492-5.603zM36.04 41.314h4.55-4.549z" fill="#CCC"/><g><path d="M49.693 27.832H33.82c-3.197 0-5.813 2.616-5.813 5.813 0 3.197 2.423 5.813 5.62 5.813H49.83l-.136-11.626z" fill="#073042"/><path d="M85.826 79.616H33.814c-3.197 0-5.813-2.616-5.813-5.814V33.627s-.017 5.831 6.195 5.831h43.137s8.493-.73 8.493 5.603v34.555z" fill="#4285F4"/><path d="M54.712 59.112L45.08 79.637h6.271l4.465-9.542c.82-1.74 3.291-1.747 4.12-.012l4.598 9.554h6.311l-9.91-20.65a5.232 5.232 0 0 0 2.049-4.148c0-2.445-1.684-4.5-3.953-5.076v-3.407a1.008 1.008 0 0 0-2.015 0v3.296c-2.548.355-4.518 2.543-4.518 5.187 0 1.763.877 3.322 2.214 4.273zm3.029-7.501a3.229 3.229 0 1 1 0 6.457 3.229 3.229 0 0 1 0-6.457z" fill="#3870B2"/><path fill="#FFF" d="M46.253 30.687h22.254v4.075H46.253z"/><path d="M65.278 34.284c-.834 0-1.513-.68-1.513-1.514 0-.835.679-1.514 1.513-1.514.835 0 1.514.68 1.514 1.514 0 .835-.679 1.514-1.514 1.514m-16.73 0c-.834 0-1.513-.68-1.513-1.514 0-.835.679-1.514 1.513-1.514.835 0 1.514.68 1.514 1.514 0 .835-.68 1.514-1.514 1.514m17.273-9.118l3.025-5.239a.63.63 0 0 0-1.09-.63l-3.063 5.306c-2.342-1.069-4.973-1.664-7.78-1.664-2.807 0-5.437.595-7.78 1.664l-3.063-5.305a.63.63 0 0 0-1.09.63l3.025 5.238c-5.194 2.825-8.747 8.084-9.267 14.297h36.35c-.52-6.213-4.073-11.472-9.267-14.297" fill="#3DDC84"/><path d="M80.595 50.617h-2.403a.29.29 0 0 0-.289.29l-.058 37.7c0 .16.13.29.289.29l2.46.014c2.878 0 5.232-2.354 5.232-5.23V45.38c0 2.877-2.354 5.236-5.231 5.236zM56.63 51.658a3.229 3.229 0 1 1 0 6.457 3.229 3.229 0 0 1 0-6.457zm1.29-1.93v-3.325a1.008 1.008 0 0 0-2.014 0v3.296c-2.549.355-4.519 2.543-4.519 5.187 0 1.763.877 3.322 2.215 4.273L41.499 84.946c-.878 1.885.498 4.044 2.578 4.044a2.843 2.843 0 0 0 2.578-1.643l8.05-17.205c.82-1.74 3.292-1.747 4.121-.012l8.234 17.112a2.84 2.84 0 0 0 2.558 1.606c2.094 0 3.468-2.188 2.56-4.074l-12.353-25.74a5.232 5.232 0 0 0 2.048-4.148c0-2.445-1.684-4.5-3.953-5.076" fill="#073042"/></g></g></svg>
\ No newline at end of file
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1081_1678)">
+<ellipse opacity="0.2" cx="64" cy="64.5547" rx="62.5" ry="62.4297" fill="black"/>
+<ellipse cx="64" cy="63.5547" rx="62.5" ry="62.4297" fill="white"/>
+<path d="M88.3705 58.8567C87.9538 58.0063 88.311 56.9857 89.1615 56.569C90.0119 56.1523 91.0325 56.5095 91.4492 57.3599C91.866 58.2104 91.5088 59.231 90.6583 59.6477C89.8078 60.0644 88.7873 59.7072 88.3705 58.8567ZM96.6456 75.8661C96.2288 75.0156 96.586 73.995 97.4365 73.5783C98.287 73.1616 99.3075 73.5188 99.7242 74.3692C100.141 75.2197 99.7838 76.2403 98.9333 76.657C98.0829 77.0737 97.0623 76.7165 96.6456 75.8661ZM97.3685 53.7965C91.9255 49.9098 84.8241 48.9063 78.25 51.4492L96.2203 88.4019C102.276 84.8044 105.865 78.5875 106.171 71.9114L112.992 72.3962C113.383 72.4217 113.723 72.1325 113.748 71.7328C113.774 71.3416 113.485 71.0014 113.085 70.9759L106.179 70.4826C106.111 67.574 105.414 64.6059 104.028 61.7483C102.641 58.8993 100.736 56.518 98.4911 54.664L102.369 48.9233C102.59 48.6001 102.505 48.1579 102.182 47.9368C101.859 47.7156 101.417 47.8007 101.196 48.1239L97.3685 53.788" fill="#3DDC84"/>
+<path d="M80.8012 67.71C75.7325 70.1594 70.281 71.4011 64.5999 71.4011C51.8004 71.4011 40.1745 64.9035 33.3963 54.5618C32.8605 53.7454 31.7549 53.5498 30.964 54.1281L24.4409 58.9332C23.701 59.4775 23.5309 60.5151 24.0497 61.2805C32.9541 74.5733 48.0328 82.8993 64.5999 82.8993C72.0244 82.8993 79.1599 81.275 85.802 78.0687L80.8012 67.71V67.71Z" fill="#4285F4"/>
+<path d="M64.5404 26.8282H68.0699V19.0294C68.0699 17.0819 66.488 15.5 64.5404 15.5C62.5929 15.5 61.011 17.0819 61.011 19.0294V26.8282H64.5404Z" fill="#4285F4"/>
+<path d="M55.3553 42.0515L31.0915 91.9909C30.5642 93.071 30.2836 94.2446 30.2581 95.4438L30.1135 101.984C30.0795 103.676 32.0355 104.629 33.3452 103.557L38.397 99.4069C39.324 98.65 40.0724 97.6975 40.5997 96.6174L64.5148 47.384L55.3638 42.06L55.3553 42.0515Z" fill="#4285F4"/>
+<path d="M98.831 95.4353C98.8055 94.2361 98.5163 93.0625 97.9975 91.9824L73.7338 42.043L64.5828 47.384L88.4978 96.6004C89.0251 97.6805 89.7735 98.6245 90.7005 99.3899L95.7523 103.54C97.062 104.612 99.0266 103.659 98.9841 101.967L98.8395 95.4268L98.831 95.4353Z" fill="#4285F4"/>
+<path d="M64.5401 26.2074C58.6974 26.2074 53.9518 30.9615 53.9518 36.7957C53.9518 42.6299 58.7059 47.384 64.5401 47.384C70.3743 47.384 75.1284 42.6299 75.1284 36.7957C75.1284 30.9615 70.3743 26.2074 64.5401 26.2074V26.2074ZM64.5401 42.6213C61.3338 42.6213 58.7144 40.0104 58.7144 36.7957C58.7144 33.5809 61.3253 30.97 64.5401 30.97C67.7548 30.97 70.3658 33.5809 70.3658 36.7957C70.3658 40.0104 67.7548 42.6213 64.5401 42.6213Z" fill="#073042"/>
+</g>
+<defs>
+<clipPath id="clip0_1081_1678">
+<rect width="128" height="128" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/android/android-emugl/host/libs/libOpenglRender/vulkan/VkDecoderGlobalState.cpp b/android/android-emugl/host/libs/libOpenglRender/vulkan/VkDecoderGlobalState.cpp
index 8f2eedeaf6..42c82c7258 100644
--- a/android/android-emugl/host/libs/libOpenglRender/vulkan/VkDecoderGlobalState.cpp
+++ b/android/android-emugl/host/libs/libOpenglRender/vulkan/VkDecoderGlobalState.cpp
@@ -1220,20 +1220,20 @@ public:
         bool emulateTextureEtc2 = false;
         bool emulateTextureAstc = false;
         VkPhysicalDeviceFeatures featuresFiltered;
+        if (needEmulatedEtc2(physicalDevice, vk)) {
+            emulateTextureEtc2 = true;
+        }
+        if (needEmulatedAstc(physicalDevice, vk)) {
+            emulateTextureAstc = true;
+        }
 
         if (pCreateInfo->pEnabledFeatures) {
             featuresFiltered = *pCreateInfo->pEnabledFeatures;
-            if (featuresFiltered.textureCompressionETC2) {
-                if (needEmulatedEtc2(physicalDevice, vk)) {
-                    emulateTextureEtc2 = true;
-                    featuresFiltered.textureCompressionETC2 = false;
-                }
+            if (emulateTextureEtc2) {
+                featuresFiltered.textureCompressionETC2 = false;
             }
-            if (featuresFiltered.textureCompressionASTC_LDR) {
-                if (needEmulatedAstc(physicalDevice, vk)) {
-                    emulateTextureAstc = true;
-                    featuresFiltered.textureCompressionASTC_LDR = false;
-                }
+            if (emulateTextureAstc) {
+                featuresFiltered.textureCompressionASTC_LDR = false;
             }
             createInfoFiltered.pEnabledFeatures = &featuresFiltered;
         }
@@ -1241,13 +1241,12 @@ public:
         vk_foreach_struct(ext, pCreateInfo->pNext) {
             switch (ext->sType) {
                 case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2:
-                    if (needEmulatedEtc2(physicalDevice, vk)) {
-                        emulateTextureEtc2 = true;
+                    if (emulateTextureEtc2) {
                         VkPhysicalDeviceFeatures2* features2 =
                             (VkPhysicalDeviceFeatures2*)ext;
                         features2->features.textureCompressionETC2 = false;
                     }
-                    if (needEmulatedAstc(physicalDevice, vk)) {
+                    if (emulateTextureAstc) {
                         emulateTextureAstc = true;
                         VkPhysicalDeviceFeatures2* features2 =
                                 (VkPhysicalDeviceFeatures2*)ext;