Add new plugin: real time shader selection

KhronosGroup · Jul 4, 2023 · ac48c2a · ac48c2a
1 parent 43bdaf0
commit ac48c2a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/framework/api_vulkan_sample.cpp b/framework/api_vulkan_sample.cpp
@@ -862,7 +862,7 @@ void ApiVulkanSample::on_update_ui_overlay(vkb::Drawer &drawer)
 
 void ApiVulkanSample::store_shader(const vkb::ShaderSourceLanguage& shaderLanguage, const std::vector<std::pair<vkb::ShaderType, std::string>>& listOfShader)
 {
-	// platform->get_available_shaders().insert({shaderLanguage, listOfShader});
+	Application::get_available_shaders().insert({shaderLanguage, listOfShader});
 }
 
 void ApiVulkanSample::create_swapchain_buffers()

diff --git a/framework/hpp_api_vulkan_sample.h b/framework/hpp_api_vulkan_sample.h
@@ -288,7 +288,7 @@ class HPPApiVulkanSample : public vkb::HPPVulkanSample
 	 * @param delta_time The time taken since the last frame
 	 * @param additional_ui Function that implements an additional Gui
 	 */
-	void update_overlay(float delta_time, const std::function<void()>& additional_ui);
+	void update_overlay(float delta_time, const std::function<void()>& additional_ui) override;
 
 	/**
 	 * @brief If the gui is enabled, then record the drawing commands to a command buffer

diff --git a/framework/platform/application.cpp b/framework/platform/application.cpp
@@ -90,4 +90,9 @@ std::weak_ptr<Gui> Application::get_gui()
 {
 	return gui;
 }
+
+std::map<ShaderSourceLanguage, std::vector<std::pair<ShaderType, std::string>>>& Application::get_available_shaders()
+{
+	return available_shaders;
+}
 }        // namespace vkb
diff --git a/framework/platform/application.h b/framework/platform/application.h
@@ -105,6 +105,8 @@ class Application
 
 	std::weak_ptr<Gui> get_gui();
 
+	std::map<ShaderSourceLanguage, std::vector<std::pair<ShaderType, std::string>>>& get_available_shaders();
+
   protected:
 	float fps{0.0f};
 
@@ -123,6 +125,11 @@ class Application
   private:
 	std::string name{};
 
+	/**
+	 * @brief stores the names of the shaders the sample uses
+	 */
+	std::map<ShaderSourceLanguage, std::vector<std::pair<ShaderType, std::string>>> available_shaders;
+
 	// The debug info of the app
 	DebugInfo debug_info{};
 

diff --git a/framework/platform/platform.cpp b/framework/platform/platform.cpp
@@ -288,7 +288,7 @@ void Platform::set_window_properties(const Window::OptionalProperties &propertie
 
 std::map<ShaderSourceLanguage, std::vector<std::pair<ShaderType, std::string>>>& Platform::get_available_shaders()
 {
-	return available_shaders;
+	return get_app().get_available_shaders();
 }
 
 const std::string &Platform::get_external_storage_directory()

diff --git a/framework/platform/platform.h b/framework/platform/platform.h
@@ -183,11 +183,6 @@ class Platform
 	const apps::AppInfo *requested_app{nullptr};
 
 	std::vector<Plugin *> plugins;
-
-	/**
-	 * @brief stores the names of the shaders the sample uses
-	 */
-	std::map<ShaderSourceLanguage, std::vector<std::pair<ShaderType, std::string>>> available_shaders;
 
 	/// Static so can be set via JNI code in android_platform.cpp
 	static std::vector<std::string> arguments;