commit be034c5366fffe1817e8363db5c97078af625b94
author Yilong Li <liyl@google.com> Fri Apr 22 15:13:13 2022 -0700
committer Yilong Li <liyl@google.com> Fri Apr 22 15:13:13 2022 -0700
tree f4538032baff326ab0d67415da86650ed25424c3
parent 3c6a6648bf035a0a8cdebf39376953bd99e06bfb

Revert "Report memory feature in getPhysicalDeviceFeature2"

This reverts commit 7b99a3875b3781b5305784b269a2aa1cc91571cf.

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index a4bf2e7..2874888 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -1642,19 +1642,6 @@
         }
     }
 
-    void on_vkGetPhysicalDeviceFeatures2(
-        void*,
-        VkPhysicalDevice,
-        VkPhysicalDeviceFeatures2* pFeatures) {
-        if (pFeatures) {
-            VkPhysicalDeviceDeviceMemoryReportFeaturesEXT* memoryReportFeaturesEXT =
-                vk_find_struct<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT>(pFeatures);
-            if (memoryReportFeaturesEXT) {
-                memoryReportFeaturesEXT->deviceMemoryReport = VK_TRUE;
-            }
-        }
-    }
-
     void on_vkGetPhysicalDeviceProperties2(
         void*,
         VkPhysicalDevice,
@@ -8131,22 +8118,6 @@
         pProperties);
 }
 
-void ResourceTracker::on_vkGetPhysicalDeviceFeatures2(
-    void* context,
-    VkPhysicalDevice physicalDevice,
-    VkPhysicalDeviceFeatures2* pFeatures) {
-    mImpl->on_vkGetPhysicalDeviceFeatures2(context, physicalDevice,
-        pFeatures);
-}
-
-void ResourceTracker::on_vkGetPhysicalDeviceFeatures2KHR(
-    void* context,
-    VkPhysicalDevice physicalDevice,
-    VkPhysicalDeviceFeatures2* pFeatures) {
-    mImpl->on_vkGetPhysicalDeviceFeatures2(context, physicalDevice,
-        pFeatures);
-}
-
 void ResourceTracker::on_vkGetPhysicalDeviceProperties2(
     void* context,
     VkPhysicalDevice physicalDevice,

system/vulkan_enc/ResourceTracker.h

diff --git a/system/vulkan_enc/ResourceTracker.h b/system/vulkan_enc/ResourceTracker.h
index e25e75d..2a67fd6 100644
--- a/system/vulkan_enc/ResourceTracker.h
+++ b/system/vulkan_enc/ResourceTracker.h
@@ -82,14 +82,6 @@
         VkInstance instance, uint32_t* pPhysicalDeviceCount,
         VkPhysicalDevice* pPhysicalDevices);
 
-    void on_vkGetPhysicalDeviceFeatures2(
-        void* context,
-        VkPhysicalDevice physicalDevice,
-        VkPhysicalDeviceFeatures2* pFeatures);
-    void on_vkGetPhysicalDeviceFeatures2KHR(
-        void* context,
-        VkPhysicalDevice physicalDevice,
-        VkPhysicalDeviceFeatures2* pFeatures);
     void on_vkGetPhysicalDeviceProperties(
         void* context,
         VkPhysicalDevice physicalDevice,

system/vulkan_enc/VkEncoder.cpp

diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index f7eef9d..36e0de6 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -11634,7 +11634,6 @@
     {
         transform_fromhost_VkPhysicalDeviceFeatures2(sResourceTracker, (VkPhysicalDeviceFeatures2*)(pFeatures));
     }
-    sResourceTracker->on_vkGetPhysicalDeviceFeatures2(this, physicalDevice, pFeatures);
     ++encodeCount;;
     if (0 == encodeCount % POOL_CLEAR_INTERVAL)
     {
@@ -17681,7 +17680,6 @@
     {
         transform_fromhost_VkPhysicalDeviceFeatures2(sResourceTracker, (VkPhysicalDeviceFeatures2*)(pFeatures));
     }
-    sResourceTracker->on_vkGetPhysicalDeviceFeatures2KHR(this, physicalDevice, pFeatures);
     ++encodeCount;;
     if (0 == encodeCount % POOL_CLEAR_INTERVAL)
     {

system/vulkan_enc/vk_struct_id.h

diff --git a/system/vulkan_enc/vk_struct_id.h b/system/vulkan_enc/vk_struct_id.h
index 833ad6d..cee3d9d 100644
--- a/system/vulkan_enc/vk_struct_id.h
+++ b/system/vulkan_enc/vk_struct_id.h
@@ -62,7 +62,6 @@
 REGISTER_VK_STRUCT_ID(VkPhysicalDeviceImageFormatInfo2, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2);
 REGISTER_VK_STRUCT_ID(VkPhysicalDeviceExternalImageFormatInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO);
 REGISTER_VK_STRUCT_ID(VkSemaphoreTypeCreateInfo, VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO);
-REGISTER_VK_STRUCT_ID(VkPhysicalDeviceFeatures2, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2);
 REGISTER_VK_STRUCT_ID(VkPhysicalDeviceProperties2, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2);
 REGISTER_VK_STRUCT_ID(VkPhysicalDeviceDeviceMemoryReportFeaturesEXT, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT);
 REGISTER_VK_STRUCT_ID(VkMemoryAllocateFlagsInfo, VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO);