From 728fbfb62bda9313dea5c839b1e939f0d7447ce4 Mon Sep 17 00:00:00 2001
From: Yahan Zhou <yahan@google.com>
Date: Wed, 23 Aug 2023 16:31:46 -0700
Subject: [PATCH] Fix testAndroidBaselineProfile2021Support for host
 swiftshader

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
---
 src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
index 519f02bb78a..6189de7daec 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
@@ -1251,6 +1251,8 @@ public:
             "VK_KHR_incremental_present",
             "VK_KHR_pipeline_executable_properties",
             "VK_EXT_queue_family_foreign",
+            "VK_KHR_descriptor_update_template",
+            "VK_KHR_storage_buffer_storage_class",
 #if defined(VK_USE_PLATFORM_ANDROID_KHR) || defined(__linux__)
             "VK_KHR_external_semaphore",
             "VK_KHR_external_semaphore_fd",
@@ -1520,10 +1522,7 @@ public:
     void on_vkGetPhysicalDeviceProperties(
         void*,
         VkPhysicalDevice,
-        VkPhysicalDeviceProperties* pProperties) {
-        if (pProperties) {
-            pProperties->deviceType = VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU;
-        }
+        VkPhysicalDeviceProperties*) {
     }
 
     void on_vkGetPhysicalDeviceFeatures2(
@@ -1544,9 +1543,6 @@ public:
         VkPhysicalDevice,
         VkPhysicalDeviceProperties2* pProperties) {
         if (pProperties) {
-            pProperties->properties.deviceType =
-                VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU;
-
             VkPhysicalDeviceDeviceMemoryReportFeaturesEXT* memoryReportFeaturesEXT =
                 vk_find_struct<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT>(pProperties);
             if (memoryReportFeaturesEXT) {