Browse Source

Revert "Enhanced physical device selection to use device type and available memory in relation to issue #35397"

This reverts commit 4f3006e5ac30d00b90eb531f3bdfd4bfa0d4025b.
Rémi Verschelde 5 years ago
parent
commit
f70b5fa30c
1 changed files with 2 additions and 33 deletions
  1. 2 33
      drivers/vulkan/vulkan_context.cpp

+ 2 - 33
drivers/vulkan/vulkan_context.cpp

@@ -356,39 +356,8 @@ Error VulkanContext::_create_physical_device() {
 		free(physical_devices);
 		ERR_FAIL_V(ERR_CANT_CREATE);
 	}
-
-	/*Find the first discrete GPU with the most VRAM.*/
-	{
-		print_line("Selecting primary GPU.");
-		VkPhysicalDeviceProperties device_properties;
-		VkPhysicalDeviceMemoryProperties memory_properties;
-		gpu = physical_devices[0];
-		uint32_t largest_vram_size = 0;
-		VkPhysicalDeviceType gpu_type = VK_PHYSICAL_DEVICE_TYPE_OTHER;
-		for (uint32_t i = 0; i < gpu_count; i++) {
-			vkGetPhysicalDeviceProperties(physical_devices[i], &device_properties);
-
-			/*Skip virtual and CPU devices for now.*/
-			if (device_properties.deviceType > VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU) {
-				continue;
-			}
-
-			vkGetPhysicalDeviceMemoryProperties(physical_devices[i], &memory_properties);
-
-			/*Total all heaps in case of 3GB+1GB configurations and similar.*/
-			uint32_t memory_size = 0;
-			for (uint32_t j = 0; j < memory_properties.memoryHeapCount; j++) {
-				memory_size += memory_properties.memoryHeaps[j].size;
-			}
-
-			if ((device_properties.deviceType >= gpu_type) || (device_properties.deviceType == gpu_type && memory_size > largest_vram_size)) {
-				gpu = physical_devices[i];
-				gpu_type = device_properties.deviceType;
-				largest_vram_size = memory_size;
-				print_line(device_properties.deviceName);
-			}
-		}
-	}
+	/* for now, just grab the first physical device */
+	gpu = physical_devices[0];
 	free(physical_devices);
 
 	/* Look for device extensions */