Clean up code

crosire · Nov 11, 2022 · ae0bba9 · ae0bba9
1 parent 4625911
commit ae0bba9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ packages/
 *.aps
 *.VC.db
 *.VC.opendb
+
+# Visual Studio user config files
 *.sdf
 *.opensdf
 *.suo

diff --git a/examples/08-texture_overlay/texturemod_overlay.cpp b/examples/08-texture_overlay/texturemod_overlay.cpp
@@ -29,11 +29,6 @@ struct tex_hash
 	}
 };
 
-struct __declspec(uuid("f326a1eb-5062-453e-9852-a787594a977a")) cmd_data
-{
-	std::unordered_set<resource_view, tex_hash> current_texture_list;
-};
-
 struct __declspec(uuid("0ce51b56-a973-4104-bcca-945686f50170")) device_data
 {
 	resource green_texture = {};
@@ -48,6 +43,11 @@ struct __declspec(uuid("0ce51b56-a973-4104-bcca-945686f50170")) device_data
 	float scale = 1.0f;
 };
 
+struct __declspec(uuid("f326a1eb-5062-453e-9852-a787594a977a")) command_list_data
+{
+	std::unordered_set<resource_view, tex_hash> current_texture_list;
+};
+
 static std::mutex s_mutex;
 
 static void on_init_device(device *device)
@@ -81,11 +81,11 @@ static void on_destroy_device(device *device)
 }
 static void on_init_cmd_list(command_list *cmd_list)
 {
-	cmd_list->create_private_data<cmd_data>();
+	cmd_list->create_private_data<command_list_data>();
 }
 static void on_destroy_cmd_list(command_list *cmd_list)
 {
-	cmd_list->destroy_private_data<cmd_data>();
+	cmd_list->destroy_private_data<command_list_data>();
 }
 
 static void on_init_texture(device *device, const resource_desc &desc, const subresource_data *, resource_usage, resource res)
@@ -145,8 +145,8 @@ static void on_push_descriptors(command_list *cmd_list, shader_stage stages, pip
 		return;
 
 	device *const device = cmd_list->get_device();
-	auto &data = device->get_private_data<struct device_data>();
-	auto &cmd_data = cmd_list->get_private_data<struct cmd_data>();
+	auto &data = device->get_private_data<device_data>();
+	auto &cmd_data = cmd_list->get_private_data<command_list_data>();
 
 	for (uint32_t i = 0; i < update.count; ++i)
 	{
@@ -198,8 +198,8 @@ static void on_bind_descriptor_sets(command_list *cmd_list, shader_stage stages,
 		return;
 
 	device *const device = cmd_list->get_device();
-	auto &cmd_data = cmd_list->get_private_data<struct cmd_data>();
-	auto &descriptor_data = device->get_private_data<struct descriptor_set_tracking>();
+	auto &cmd_data = cmd_list->get_private_data<command_list_data>();
+	auto &descriptor_data = device->get_private_data<descriptor_set_tracking>();
 	assert((&descriptor_data) != nullptr);
 
 	for (uint32_t i = 0; i < count; ++i)
@@ -233,14 +233,14 @@ static void on_bind_descriptor_sets(command_list *cmd_list, shader_stage stages,
 static void on_execute(command_queue *, command_list *cmd_list)
 {
 	device *const device = cmd_list->get_device();
-	auto &data = device->get_private_data<struct device_data>();
-	auto &cmd_data = cmd_list->get_private_data<struct cmd_data>();
+	auto &data = device->get_private_data<device_data>();
+	auto &cmd_data = cmd_list->get_private_data<command_list_data>();
 
 	data.current_texture_list.insert(cmd_data.current_texture_list.begin(), cmd_data.current_texture_list.end());
 	cmd_data.current_texture_list.clear();
 }
 
-static void on_present(command_queue *queue, swapchain *swapchain, const rect *, const rect *, uint32_t, const rect *)
+static void on_present(command_queue *, swapchain *swapchain, const rect *, const rect *, uint32_t, const rect *)
 {
 	device *const device = swapchain->get_device();
 

diff --git a/setup/Properties/Assembly.manifest b/setup/Properties/Assembly.manifest
@@ -15,7 +15,7 @@
       <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
-      <!-- Windows 10 -->
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
     </application>
   </compatibility>

diff --git a/source/d3d12/d3d12_impl_swapchain.hpp b/source/d3d12/d3d12_impl_swapchain.hpp
@@ -22,7 +22,7 @@ namespace reshade::d3d12
 		api::resource get_back_buffer(uint32_t index) final;
 
 		uint32_t get_back_buffer_count() const final;
-		uint32_t get_current_back_buffer_index() const;
+		uint32_t get_current_back_buffer_index() const override;
 
 		void set_back_buffer_color_space(DXGI_COLOR_SPACE_TYPE type);