commit 5074929f8600a8a9fec47a749d5f9326a9cc6bde
author Ian Elliott <ianelliott@google.com> Mon Feb 27 22:50:02 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 27 22:50:02 2023 +0000
tree 2790bb18f9ff17cbdaa71e0031f793074eefba70
parent b304b2f1177251c5deb904306ba5ad820e1c119d
parent 87e3dd8633f57928654d15a480b29f2673f2837f

Merge "RE-SkiaVk: Use vkGetDeviceQueue2 instead of vkGetDeviceQueue" into udc-dev

libs/renderengine/skia/SkiaVkRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaVkRenderEngine.cpp b/libs/renderengine/skia/SkiaVkRenderEngine.cpp
index 8d99f3d..936e316 100644
--- a/libs/renderengine/skia/SkiaVkRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaVkRenderEngine.cpp
@@ -444,8 +444,11 @@
     ALOGD("Trying to create Vk device with protectedContent=%d (success)", protectedContent);
 
     VkQueue graphicsQueue;
-    VK_GET_DEV_PROC(device, GetDeviceQueue);
-    vkGetDeviceQueue(device, graphicsQueueIndex, 0, &graphicsQueue);
+    VK_GET_DEV_PROC(device, GetDeviceQueue2);
+    const VkDeviceQueueInfo2 deviceQueueInfo2 = {VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2, nullptr,
+                                                 deviceQueueCreateFlags,
+                                                 (uint32_t)graphicsQueueIndex, 0};
+    vkGetDeviceQueue2(device, &deviceQueueInfo2, &graphicsQueue);
 
     VK_GET_DEV_PROC(device, DeviceWaitIdle);
     VK_GET_DEV_PROC(device, DestroyDevice);