From 3063369322fe2cc23da664bbc684602c0ac6783b Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Tue, 23 Feb 2021 14:22:55 +0300
Subject: [PATCH] vk::render_device::create: try to remove failing assertion

---
 rpcs3/Emu/RSX/VK/vkutils/device.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp
index d055d3cb6c..1db73b0bbb 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp
@@ -234,15 +234,14 @@ namespace vk
 		float queue_priorities[1] = { 0.f };
 		pgpu = &pdev;
 
-		ensure(graphics_queue_idx == present_queue_idx || present_queue_idx == UINT32_MAX); // TODO
+		ensure(graphics_queue_idx == present_queue_idx || present_queue_idx == umax); // TODO
 		m_graphics_queue_family = graphics_queue_idx;
 		m_present_queue_family = present_queue_idx;
 		m_transfer_queue_family = transfer_queue_idx;
 
 		std::vector<VkDeviceQueueCreateInfo> device_queues;
-		device_queues.push_back({});
 
-		auto & graphics_queue = device_queues.back();
+		auto& graphics_queue = device_queues.emplace_back();
 		graphics_queue.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
 		graphics_queue.pNext = NULL;
 		graphics_queue.flags = 0;
@@ -250,12 +249,9 @@ namespace vk
 		graphics_queue.queueCount = 1;
 		graphics_queue.pQueuePriorities = queue_priorities;
 
-		if (graphics_queue_idx != transfer_queue_idx)
+		if (graphics_queue_idx != transfer_queue_idx && transfer_queue_idx != umax)
 		{
-			ensure(transfer_queue_idx != UINT32_MAX);
-
-			device_queues.push_back({});
-			auto & transfer_queue = device_queues.back();
+			auto& transfer_queue = device_queues.emplace_back();
 			transfer_queue.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
 			transfer_queue.pNext = NULL;
 			transfer_queue.flags = 0;