asdf

samples/api/texture_loading/texture_loading.h

@@ -1,10 +1,31 @@
-#pragma once
+/* Copyright (c) 2019-2024, Sascha Willems
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 the "License";
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /*
+  * Texture loading (and display) example (including mip maps)
+  */
+
+#pragma once
 
 #include <ktx.h>
 
 #include "api_vulkan_sample.h"
 
-// 顶点结构保持不变，因为背景 quad 可能不需要顶点缓冲区
+  // Vertex layout for this example
 struct TextureLoadingVertexStructure
 {
 	float pos[3];
@@ -15,6 +36,8 @@ struct TextureLoadingVertexStructure
 class TextureLoading : public ApiVulkanSample
 {
 public:
+	// Contains all Vulkan objects that are required to store and use a texture
+	// Note that this repository contains a texture class (vulkan_texture.h) that encapsulates texture loading functionality in a class that is used in subsequent demos
 	struct Texture
 	{
 		VkSampler      sampler;
@@ -27,7 +50,7 @@ public:
 	};
 
 	Texture texture = { 0 };
-	Texture cam_text = { 0 }; // 将由外部函数初始化
+	Texture cam_text = { 0 };
 
 	std::unique_ptr<vkb::core::BufferC> vertex_buffer;
 	std::unique_ptr<vkb::core::BufferC> index_buffer;
@@ -45,56 +68,45 @@ public:
 
 	struct
 	{
-		VkPipeline solid;          // 原有前景管线
+		VkPipeline solid;
-		VkPipeline background;     // 新增背景管线
+		VkPipeline background;
 	} pipelines;
 
-	// 管线布局
+	VkPipelineLayout      pipeline_layout;
-	VkPipelineLayout      pipeline_layout;       // 前景管线布局
+	VkPipelineLayout      pipeline_layout_bg;
-	VkPipelineLayout      pipeline_layout_bg;    // 背景管线布局
+	VkDescriptorSet       descriptor_set;
-
+	VkDescriptorSetLayout descriptor_set_layout;
-	// 描述符集
-	VkDescriptorSet       descriptor_set;         // 前景描述符集
-	VkDescriptorSet       descriptor_set_bg;      // 背景描述符集
-
-	// 描述符集布局
-	VkDescriptorSetLayout descriptor_set_layout;  // 前景描述符集布局
-	VkDescriptorSetLayout descriptor_set_layout_bg; // 背景描述符集布局 (仅包含 combined image sampler)
-
-	static TextureLoading* Get() {
-		return loadTextIns;
-	}
-	static TextureLoading* loadTextIns;
 
 	TextureLoading();
 	~TextureLoading();
 	virtual void request_gpu_features(vkb::PhysicalDevice& gpu) override;
+	void         load_texture();
+	void         destroy_texture(Texture texture);
 	void         build_command_buffers() override;
 	void         draw();
-	void         generate_quad(); // 生成前景 quad
+	void         generate_quad();
 	void         setup_descriptor_pool();
 	void         setup_descriptor_set_layout();
-	void         setup_descriptor_set_layout_bg(); // 新增：设置背景描述符集布局
+	void         setup_descriptor_set_layout_bg();
 	void         setup_descriptor_set();
-	void         setup_descriptor_set_bg(); // 新增：设置背景描述符集
 	void         prepare_pipelines();
-	void         prepare_pipeline_bg(); // 新增：准备背景管线
 	void         prepare_uniform_buffers();
 	void         update_uniform_buffers();
 	bool         prepare(const vkb::ApplicationOptions& options) override;
 	virtual void render(float delta_time) override;
 	virtual void view_changed() override;
 	virtual void on_update_ui_overlay(vkb::Drawer& drawer) override;
-	void destroy_texture(Texture texture);
 
-	// 现有函数保持不变
+	void            processWithVulkan(uint8_t* data, int width, int height, int rowStride, size_t dataSize, Texture& out_texture);
-	void processWithVulkan(uint8_t* data, int width, int height, int format, int rowStride, size_t dataSize, Texture& out_texture);
+	void            createTexture(VkDevice device, VkPhysicalDevice physicalDevice, int width, int height, Texture& texture);
-	void createTexture(VkDevice device, VkPhysicalDevice physicalDevice, int width, int height, int format, Texture& texture);
+	void            updateTexture(VkDevice device, VkPhysicalDevice physicalDevice, VkCommandPool commandPool, VkQueue queue, uint8_t* data, int width, int height, int rowStride, size_t dataSize, Texture& texture);
-	void updateTexture(VkDevice device, VkPhysicalDevice physicalDevice, VkCommandPool commandPool, VkQueue queue, uint8_t* data, int width, int height, int rowStride, size_t dataSize, Texture& texture);
+	uint32_t        findMemoryType(VkPhysicalDevice physicalDevice, uint32_t typeFilter, VkMemoryPropertyFlags properties);
-	uint32_t findMemoryType(VkPhysicalDevice physicalDevice, uint32_t typeFilter, VkMemoryPropertyFlags properties);
 	VkCommandBuffer beginSingleTimeCommands(VkDevice device, VkCommandPool commandPool);
-	void endSingleTimeCommands(VkDevice device, VkCommandPool commandPool, VkQueue queue, VkCommandBuffer commandBuffer);
+	void            endSingleTimeCommands(VkDevice device, VkCommandPool commandPool, VkQueue queue, VkCommandBuffer commandBuffer);
-	void transitionImageLayout(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout oldLayout, VkImageLayout newLayout);
+	void            transitionImageLayout(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout oldLayout, VkImageLayout newLayout);
+
+public:
+	void prepare_pipeline_bg();
 };
 
-std::unique_ptr<vkb::Application> create_texture_loading();
+std::unique_ptr<vkb::Application> create_texture_loading();