diff options
| author | Yahan Zhou <yahan@google.com> | 2023-08-28 21:26:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-28 21:26:37 +0000 |
| commit | 3253c522963896fa2911b1b6825068c3f88e5ff6 (patch) | |
| tree | 9c04917ca625b87062942f82b508e9455009853c | |
| parent | 0fd3a4b019928aeca62c04c5ab1b1b5678dab3a0 (diff) | |
| parent | 3c9793e6ce800a99ad17950152b43fe0d82e9c0d (diff) | |
| download | goldfish-opengl-3253c522963896fa2911b1b6825068c3f88e5ff6.tar.gz | |
Merge changes from topics "gfxstream-deferred-ahb-bind-udc-dev", "vk1.3" into udc-dev am: 3c9793e6ce
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/24526374
Change-Id: I8e4d661a9a09f6dc97aa6b8d1486934b5042f4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/vulkan_enc/VkEncoder.h | 5 | ||||
| -rw-r--r-- | system/vulkan_enc/VulkanHandles.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/system/vulkan_enc/VkEncoder.h b/system/vulkan_enc/VkEncoder.h index 185f737b..a04660fa 100644 --- a/system/vulkan_enc/VkEncoder.h +++ b/system/vulkan_enc/VkEncoder.h @@ -37,9 +37,10 @@ #include "goldfish_vk_private_defs.h" #include "vulkan_gfxstream.h" -namespace gfxstream { +// ToT and udc-dev defines IOStream in different namespace +// namespace gfxstream { class IOStream; -} +// } namespace gfxstream { namespace vk { diff --git a/system/vulkan_enc/VulkanHandles.h b/system/vulkan_enc/VulkanHandles.h index 1c1cbc3a..54dc011f 100644 --- a/system/vulkan_enc/VulkanHandles.h +++ b/system/vulkan_enc/VulkanHandles.h @@ -34,6 +34,7 @@ namespace vk { #define __GOLDFISH_VK_LIST_NON_DISPATCHABLE_HANDLE_TYPES_NVX_BINARY_IMPORT(f) \ f(VkCuModuleNVX) \ f(VkCuFunctionNVX) \ + f(VkMicromapEXT) \ #else |