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

Commit 74f28ddb authored by Jesse Hall's avatar Jesse Hall
Browse files

libvulkan: Fix check for redundant vkDeviceQueue calls 

dEQP test sets typically create a device once, but call
vkGetDeviceQueue in each test case. Due to this bug we were failing
all but the first call.

Change-Id: If5a07ae23d630e64d06b7028b7e62f389533da43
(cherry picked from commit 8be3d02cb116d82aac0e2c8f50168d816bfec4a0)
parent 9a16f975

vulkan/libvulkan/loader.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1058,7 +1058,7 @@ VkResult GetDeviceQueue(VkDevice drv_device, 
        return result;

        return result;

    hwvulkan_dispatch_t* dispatch =

    hwvulkan_dispatch_t* dispatch =

        reinterpret_cast<hwvulkan_dispatch_t*>(queue);

        reinterpret_cast<hwvulkan_dispatch_t*>(queue);

    if (dispatch->magic != HWVULKAN_DISPATCH_MAGIC && dispatch->vtbl != &vtbl) {

    if (dispatch->magic != HWVULKAN_DISPATCH_MAGIC && dispatch->vtbl != vtbl) {

        ALOGE("invalid VkQueue dispatch magic: 0x%" PRIxPTR, dispatch->magic);

        ALOGE("invalid VkQueue dispatch magic: 0x%" PRIxPTR, dispatch->magic);

        return VK_ERROR_INITIALIZATION_FAILED;

        return VK_ERROR_INITIALIZATION_FAILED;

    }

    }