Unify vkb::Gui and vkb::HPPGui into vkb::Gui<bindingType> (KhronosGroup#1376)

Author: asuessenbach

app/plugins/user_interface_options/user_interface_options.cpp

@@ -21,7 +21,6 @@
 #include <algorithm>
 
 #include "gui.h"
-#include "hpp_gui.h"
 
 namespace plugins
 {
@@ -40,8 +39,8 @@ bool UserInterfaceOptions::handle_option(std::deque<std::string> &arguments)
 	std::string option = arguments[0].substr(2);
 	if (option == "hideui")
 	{
-		vkb::Gui::visible    = false;
-		vkb::HPPGui::visible = false;
+		vkb::GuiC::visible   = false;
+		vkb::GuiCpp::visible = false;
 
 		arguments.pop_front();
 		return true;

framework/CMakeLists.txt

@@ -44,14 +44,12 @@ set(FRAMEWORK_FILES
     hpp_api_vulkan_sample.h
     hpp_fence_pool.h
     hpp_gltf_loader.h
-    hpp_gui.h
     hpp_resource_binding_state.h
     hpp_resource_cache.h
     hpp_resource_record.h
     hpp_resource_replay.h
     hpp_semaphore_pool.h
     # Source Files
-    gui.cpp
     drawer.cpp
     spirv_reflection.cpp
     gltf_loader.cpp
@@ -67,7 +65,6 @@ set(FRAMEWORK_FILES
     timer.cpp
     camera_core.cpp
     hpp_api_vulkan_sample.cpp
-    hpp_gui.cpp
     hpp_resource_cache.cpp)
 
 set(COMMON_FILES

framework/common/hpp_vk_common.h

@@ -152,6 +152,26 @@ inline void image_layout_transition(vk::CommandBuffer                command_buf
 	                             static_cast<VkImageSubresourceRange const &>(subresource_range));
 }
 
+inline void make_filters_valid(vk::PhysicalDevice physical_device, vk::Format format, vk::Filter *filter, vk::SamplerMipmapMode *mipmapMode = nullptr)
+{
+	// Not all formats support linear filtering, so we need to adjust them if they don't
+	if (*filter == vk::Filter::eNearest && (mipmapMode == nullptr || *mipmapMode == vk::SamplerMipmapMode::eNearest))
+	{
+		return;        // These must already be valid
+	}
+
+	vk::FormatProperties properties = physical_device.getFormatProperties(format);
+
+	if (!(properties.optimalTilingFeatures & vk::FormatFeatureFlagBits::eSampledImageFilterLinear))
+	{
+		*filter = vk::Filter::eNearest;
+		if (mipmapMode)
+		{
+			*mipmapMode = vk::SamplerMipmapMode::eNearest;
+		}
+	}
+}
+
 inline vk::SurfaceFormatKHR select_surface_format(vk::PhysicalDevice             gpu,
                                                   vk::SurfaceKHR                 surface,
                                                   std::vector<vk::Format> const &preferred_formats = {