diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-25 01:03:06 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-25 01:03:06 +0000 |
| commit | 67b5d6e2ccf6545909a07663b4dff14443899ef7 (patch) | |
| tree | ae573095273b4918e491991f969b127844b6d567 | |
| parent | b63680aad07d81b535bfdd58cdb27f702ce2c5a9 (diff) | |
| parent | 68b584f970048e2dd542941684abe48a95dad28b (diff) | |
| download | goldfish-opengl-67b5d6e2ccf6545909a07663b4dff14443899ef7.tar.gz | |
Snap for 7490979 from 68b584f970048e2dd542941684abe48a95dad28b to sc-release
Change-Id: I513bca1b5aa8b28321590fac4631f23dc5551719
| -rw-r--r-- | system/vulkan_enc/ResourceTracker.cpp | 13 | ||||
| -rw-r--r-- | system/vulkan_enc/vk_struct_id.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp index 62566fc3..3fa037a5 100644 --- a/system/vulkan_enc/ResourceTracker.cpp +++ b/system/vulkan_enc/ResourceTracker.cpp @@ -129,6 +129,7 @@ VkResult getMemoryAndroidHardwareBufferANDROID(struct AHardwareBuffer **) { retu #include "goldfish_address_space.h" #include "goldfish_vk_private_defs.h" #include "vk_format_info.h" +#include "vk_struct_id.h" #include "vk_util.h" #include <set> @@ -1607,13 +1608,11 @@ public: pProperties->properties.deviceType = VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU; - VkPhysicalDeviceDeviceMemoryReportFeaturesEXT *memoryReportFeaturesEXT - = new VkPhysicalDeviceDeviceMemoryReportFeaturesEXT(); - memoryReportFeaturesEXT->sType - = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT; - memoryReportFeaturesEXT->pNext = pProperties->pNext; - memoryReportFeaturesEXT->deviceMemoryReport = VK_TRUE; - pProperties->pNext = memoryReportFeaturesEXT; + VkPhysicalDeviceDeviceMemoryReportFeaturesEXT* memoryReportFeaturesEXT = + vk_find_struct<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT>(pProperties); + if (memoryReportFeaturesEXT) { + memoryReportFeaturesEXT->deviceMemoryReport = VK_TRUE; + } } } diff --git a/system/vulkan_enc/vk_struct_id.h b/system/vulkan_enc/vk_struct_id.h index 5cfb7955..5a7328a9 100644 --- a/system/vulkan_enc/vk_struct_id.h +++ b/system/vulkan_enc/vk_struct_id.h @@ -56,5 +56,7 @@ REGISTER_VK_STRUCT_ID(VkExternalImageFormatProperties, VK_STRUCTURE_TYPE_EXTERNA 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(VkPhysicalDeviceProperties2, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2); +REGISTER_VK_STRUCT_ID(VkPhysicalDeviceDeviceMemoryReportFeaturesEXT, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT); #undef REGISTER_VK_STRUCT_ID |