Merge "Enable VK_MVK_macos_surface for host dispatch" into main

This commit is contained in:
Serdar Kocdemir 2025-08-29 09:12:09 -07:00 committed by Android (Google) Code Review
commit 596b781dc2
2 changed files with 2 additions and 1 deletions

View file

@ -120,6 +120,7 @@ SUPPORTED_FEATURES = [
"VK_NV_device_diagnostic_checkpoints",
"VK_KHR_ray_tracing_pipeline",
"VK_KHR_pipeline_library",
"VK_MVK_macos_surface",
# Android
"VK_ANDROID_native_buffer",
"VK_ANDROID_external_memory_android_hardware_buffer",
@ -161,6 +162,7 @@ SUPPORTED_MODULES = {
"VK_EXT_external_memory_metal": ["goldfish_vk_dispatch"],
"VK_KHR_external_semaphore_win32" : ["goldfish_vk_dispatch"],
"VK_KHR_external_memory_win32" : ["goldfish_vk_dispatch"],
"VK_MVK_macos_surface" : ["goldfish_vk_dispatch"],
# Host dispatch for Linux hosts + and entrypoint for guests
"VK_KHR_external_memory_fd": ["goldfish_vk_dispatch", "func_table"],
"VK_QNX_external_memory_screen_buffer": ["goldfish_vk_dispatch"],

View file

@ -27722,7 +27722,6 @@ void VkEncoder::vkTraceAsyncGOOGLE(uint64_t id, uint32_t doLock) {
uint32_t packetSize_vkTraceAsyncGOOGLE =
4 + 4 + (queueSubmitWithCommandsEnabled ? 4 : 0) + count;
uint8_t* streamPtr = stream->reserve(packetSize_vkTraceAsyncGOOGLE);
uint8_t* packetBeginPtr = streamPtr;
uint8_t** streamPtrPtr = &streamPtr;
uint32_t opcode_vkTraceAsyncGOOGLE = OP_vkTraceAsyncGOOGLE;
uint32_t seqno;