From 6043129631b4445ac34d6e2deb02068599c18677 Mon Sep 17 00:00:00 2001
From: Charles Giessen <charles@lunarg.com>
Date: Sat, 7 Mar 2020 15:44:47 -0700
Subject: [PATCH] Renamed allow_fallback_gpu_type to allow_any_type and
 refactored implementation to be simpler

---
 src/VkBootstrap.cpp | 13 ++++---------
 src/VkBootstrap.h   | 15 +++++++++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/VkBootstrap.cpp b/src/VkBootstrap.cpp
index 39ce101..e3b9d91 100644
--- a/src/VkBootstrap.cpp
+++ b/src/VkBootstrap.cpp
@@ -674,13 +674,8 @@ PhysicalDeviceSelector::Suitable PhysicalDeviceSelector::is_device_suitable (Phy
 	}
 	if (criteria.require_present && !swapChainAdequate) suitable = Suitable::no;
 
-	if ((criteria.preferred_type == PreferredDeviceType::discrete &&
-	        pd.device_properties.deviceType != VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU) ||
-	    (criteria.preferred_type == PreferredDeviceType::integrated &&
-	        pd.device_properties.deviceType != VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU) ||
-	    (criteria.preferred_type == PreferredDeviceType::virtual_gpu &&
-	        pd.device_properties.deviceType != VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU)) {
-		if (criteria.allow_fallback)
+	if (pd.device_properties.deviceType != static_cast<VkPhysicalDeviceType> (criteria.preferred_type)) {
+		if (criteria.allow_any_type)
 			suitable = Suitable::partial;
 		else
 			suitable = Suitable::no;
@@ -778,8 +773,8 @@ PhysicalDeviceSelector& PhysicalDeviceSelector::prefer_gpu_device_type (Preferre
 	criteria.preferred_type = type;
 	return *this;
 }
-PhysicalDeviceSelector& PhysicalDeviceSelector::allow_fallback_gpu_type (bool fallback) {
-	criteria.allow_fallback = fallback;
+PhysicalDeviceSelector& PhysicalDeviceSelector::allow_any_gpu_device_type (bool allow_any_type) {
+	criteria.allow_any_type = allow_any_type;
 	return *this;
 }
 PhysicalDeviceSelector& PhysicalDeviceSelector::require_present (bool require) {
diff --git a/src/VkBootstrap.h b/src/VkBootstrap.h
index abb2ef6..5f342f5 100644
--- a/src/VkBootstrap.h
+++ b/src/VkBootstrap.h
@@ -280,7 +280,14 @@ struct PhysicalDevice {
 	friend class DeviceBuilder;
 };
 
-enum class PreferredDeviceType { discrete, integrated, virtual_gpu, cpu, dont_care };
+enum class PreferredDeviceType {
+	other = 0,
+	integrated = 1,
+	discrete = 2,
+	virtual_gpu = 3,
+	cpu = 4
+};
+
 class PhysicalDeviceSelector {
 	public:
 	// Requires a vkb::Instance to construct, needed to pass instance creation info.
@@ -292,8 +299,8 @@ class PhysicalDeviceSelector {
 	PhysicalDeviceSelector& set_surface (VkSurfaceKHR instance);
 	// Set the desired physical device type to select. Defaults to PreferredDeviceType::discrete.
 	PhysicalDeviceSelector& prefer_gpu_device_type (PreferredDeviceType type = PreferredDeviceType::discrete);
-	// Allow fallback to a device type that isn't the preferred physical device type. Defaults to true.
-	PhysicalDeviceSelector& allow_fallback_gpu_type (bool fallback = true);
+	// Allow selection of a gpu device type that isn't the preferred physical device type. Defaults to true.
+	PhysicalDeviceSelector& allow_any_gpu_device_type (bool allow_any_type = true);
 
 	// Require that a physical device supports presentation. Defaults to true.
 	PhysicalDeviceSelector& require_present (bool require = true);
@@ -352,7 +359,7 @@ class PhysicalDeviceSelector {
 
 	struct SelectionCriteria {
 		PreferredDeviceType preferred_type = PreferredDeviceType::discrete;
-		bool allow_fallback = true;
+		bool allow_any_type = true;
 		bool require_present = true;
 		bool require_dedicated_transfer_queue = false;
 		bool require_dedicated_compute_queue = false;