commit 87e3dd8633f57928654d15a480b29f2673f2837f
author Ian Elliott <ianelliott@google.com> Mon Feb 27 12:07:10 2023 -0700
committer Ian Elliott <ianelliott@google.com> Mon Feb 27 12:17:22 2023 -0700
tree 6eb6487f1d56c4d9ad5a70a9eafb52c76a761237
parent 8e8f543a67aedf0719826edc08b2bcb04868139f

RE-SkiaVk: Use vkGetDeviceQueue2 instead of vkGetDeviceQueue

The original code violated the spec.  Since RE-SkiaVk can create a
queue with the VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT flag, it must use
vkGetDeviceQueue2 instead of vkGetDeviceQueue.

Test: Inspection and logcat
Bug: 266943585
Change-Id: I5a8d406ef08fba9293a2b93a4c7ca3fed736993d

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);