Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e1efff0 authored by Ian Elliott's avatar Ian Elliott Committed by Automerger Merge Worker
Browse files

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

Merge "RE-SkiaVk: Use vkGetDeviceQueue2 instead of vkGetDeviceQueue" into udc-dev am: 5074929f am: 447f61c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21613673



Change-Id: I6fe2c8f5c61e359d5300d2b169302c6bca5c64bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6425a852 447f61c1

libs/renderengine/skia/SkiaVkRenderEngine.cpp

+5 −2
Original line number Diff line number Diff line
@@ -444,8 +444,11 @@ VulkanInterface initVulkanInterface(bool protectedContent = false) { 
    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);