From the Vulkan documentation, the queueFamilyIndex value will be created with VkDeviceQueueCreateInfo. So let's avoid counting the index value and just refer to the already-created value. This will resolve crashes on some GPUs for various workloads. v2: Needed to use GetDeviceQueue() in order to map the queueFamilyIndex values. These values can be different when obtaining the queue used for presentation, so we need to ensure we update the mapped queueFamilyIndex value for the associated queue_data struct. Signed-off-by: Casey Bowman <casey.g.bowman@intel.com> Reviewed-by: Felix DeGrood <felix.j.degrood@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33487>