windows 上编译通过

2025-10-16 16:01:55 +08:00
parent 96ac7b4b0d
commit fc5d6e5cd8
152 changed files with 117134 additions and 35 deletions
@@ -1,8 +1,8 @@
-#include "HelloTriangleApplication.h"
+#include "Application.h"

 bool enableValidationLayers = true;

-void HelloTriangleApplication::createInstance()
+void Application::createInstance()
 {
 	if (enableValidationLayers && !checkValidationLayerSupport()) {
 		throw std::runtime_error("validation layers requested, but not available!");
@@ -47,7 +47,7 @@ void HelloTriangleApplication::createInstance()
 	}
 }

-void HelloTriangleApplication::initWindow()
+void Application::initWindow()
 {
 	glfwInit();

@@ -57,7 +57,7 @@ void HelloTriangleApplication::initWindow()
 	window = glfwCreateWindow(kWidth, kHeight, "Vulkan", nullptr, nullptr);
 }

-void HelloTriangleApplication::run()
+void Application::run()
 {
 	initWindow();
 	initVulkan();
@@ -65,7 +65,7 @@ void HelloTriangleApplication::run()
 	cleanup();
 }

-void HelloTriangleApplication::createSurface() {
+void Application::createSurface() {
 	if (glfwCreateWindowSurface(instance, window, nullptr, &surface) != VK_SUCCESS) {
 		throw std::runtime_error("failed to create window surface!");
 	}
@@ -92,7 +92,7 @@ VkResult CreateDebugUtilsMessengerEXT(VkInstance instance, const VkDebugUtilsMes
 	}
 }

-void HelloTriangleApplication::setupDebugMessenger() {
+void Application::setupDebugMessenger() {
 	if (!enableValidationLayers)
 		return;

@@ -108,7 +108,7 @@ void HelloTriangleApplication::setupDebugMessenger() {
 	}
 }

-void HelloTriangleApplication::initVulkan()
+void Application::initVulkan()
 {
 	createInstance();          // 创建 Vulkan 实例
 	setupDebugMessenger(); // 在这里调用
@@ -127,7 +127,7 @@ void HelloTriangleApplication::initVulkan()
 	createSyncObjects();       // 创建同步对象
 }

-void HelloTriangleApplication::createImageViews() {
+void Application::createImageViews() {
 	swapChainImageViews.resize(swapChainImages.size());

 	for (size_t i = 0; i < swapChainImages.size(); i++) {
@@ -152,7 +152,7 @@ void HelloTriangleApplication::createImageViews() {
 	}
 }

-void HelloTriangleApplication::createFramebuffers() {
+void Application::createFramebuffers() {
 	swapChainFramebuffers.resize(swapChainImageViews.size());

 	for (size_t i = 0; i < swapChainImageViews.size(); i++) {
@@ -175,7 +175,7 @@ void HelloTriangleApplication::createFramebuffers() {
 	}
 }

-void HelloTriangleApplication::createCommandPool() {
+void Application::createCommandPool() {
 	QueueFamilyIndices queueFamilyIndices = findQueueFamilies(physicalDevice);

 	VkCommandPoolCreateInfo poolInfo{};
@@ -188,7 +188,7 @@ void HelloTriangleApplication::createCommandPool() {
 	}
 }

-void HelloTriangleApplication::createCommandBuffer() {
+void Application::createCommandBuffer() {
 	VkCommandBufferAllocateInfo allocInfo{};
 	allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
 	allocInfo.commandPool = commandPool;
@@ -200,7 +200,7 @@ void HelloTriangleApplication::createCommandBuffer() {
 	}
 }

-void HelloTriangleApplication::mainLoop()
+void Application::mainLoop()
 {
 	while (!glfwWindowShouldClose(window))
 	{
@@ -211,7 +211,7 @@ void HelloTriangleApplication::mainLoop()
 }


-void HelloTriangleApplication::pickPhysicalDevice() {
+void Application::pickPhysicalDevice() {
 	uint32_t deviceCount = 0;
 	vkEnumeratePhysicalDevices(instance, &deviceCount, nullptr);
 	if (deviceCount == 0) {
@@ -233,7 +233,7 @@ void HelloTriangleApplication::pickPhysicalDevice() {
 }


-QueueFamilyIndices HelloTriangleApplication::findQueueFamilies(VkPhysicalDevice device) {
+QueueFamilyIndices Application::findQueueFamilies(VkPhysicalDevice device) {
 	QueueFamilyIndices indices;

 	uint32_t queueFamilyCount = 0;
@@ -260,7 +260,7 @@ QueueFamilyIndices HelloTriangleApplication::findQueueFamilies(VkPhysicalDevice
 	return indices;
 }

-bool HelloTriangleApplication::checkDeviceExtensionSupport(VkPhysicalDevice device) {
+bool Application::checkDeviceExtensionSupport(VkPhysicalDevice device) {
 	// 获取设备支持的扩展数量
 	uint32_t extensionCount;
 	vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, nullptr);
@@ -292,7 +292,7 @@ bool HelloTriangleApplication::checkDeviceExtensionSupport(VkPhysicalDevice devi
 	return true; // 所有扩展都支持
 }

-bool HelloTriangleApplication::checkSwapChainSupport(VkPhysicalDevice device) {
+bool Application::checkSwapChainSupport(VkPhysicalDevice device) {
 	uint32_t formatCount;
 	vkGetPhysicalDeviceSurfaceFormatsKHR(device, surface, &formatCount, nullptr);

@@ -302,7 +302,7 @@ bool HelloTriangleApplication::checkSwapChainSupport(VkPhysicalDevice device) {
 	return formatCount > 0 && presentModeCount > 0;
 }

-bool HelloTriangleApplication::isDeviceSuitable(VkPhysicalDevice device) {
+bool Application::isDeviceSuitable(VkPhysicalDevice device) {
 	QueueFamilyIndices indices = findQueueFamilies(device);
 	bool extensionsSupported = checkDeviceExtensionSupport(device);
 	bool swapChainAdequate = false;
@@ -312,7 +312,7 @@ bool HelloTriangleApplication::isDeviceSuitable(VkPhysicalDevice device) {
 	return indices.isComplete() && extensionsSupported && swapChainAdequate;
 }

-void HelloTriangleApplication::createLogicalDevice() {
+void Application::createLogicalDevice() {
 	QueueFamilyIndices indices = findQueueFamilies(physicalDevice);

 	std::vector<VkDeviceQueueCreateInfo> queueCreateInfos;
@@ -351,7 +351,7 @@ void HelloTriangleApplication::createLogicalDevice() {
 	vkGetDeviceQueue(device, indices.presentFamily.value(), 0, &presentQueue);
 }

-void HelloTriangleApplication::createSwapChain() {
+void Application::createSwapChain() {
 	// 选择交换链格式、颜色空间和分辨率
 	VkSurfaceFormatKHR surfaceFormat = { VK_FORMAT_B8G8R8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR };
 	VkPresentModeKHR presentMode = VK_PRESENT_MODE_FIFO_KHR;
@@ -402,7 +402,7 @@ void HelloTriangleApplication::createSwapChain() {
 	swapChainExtent = extent;
 }

-void HelloTriangleApplication::createPipelineLayout() {
+void Application::createPipelineLayout() {
 	VkPipelineLayoutCreateInfo pipelineLayoutInfo{};
 	pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
 	pipelineLayoutInfo.setLayoutCount = 0; // 可选：描述符集布局
@@ -415,7 +415,7 @@ void HelloTriangleApplication::createPipelineLayout() {
 	}
 }

-void HelloTriangleApplication::createGraphicsPipeline() {
+void Application::createGraphicsPipeline() {
 	// 顶点着色器和片段着色器
 	auto vertShaderCode = readFile("D:/Graphics/vulkan_demo/shaders/simple_shader.vert.spv");
 	auto fragShaderCode = readFile("D:/Graphics/vulkan_demo/shaders/simple_shader.frag.spv");
@@ -525,7 +525,7 @@ void HelloTriangleApplication::createGraphicsPipeline() {
 	vkDestroyShaderModule(device, vertShaderModule, nullptr);
 }

-void HelloTriangleApplication::createRenderPass() {
+void Application::createRenderPass() {
 	VkAttachmentDescription colorAttachment{};
 	colorAttachment.format = swapChainImageFormat;
 	colorAttachment.samples = VK_SAMPLE_COUNT_1_BIT;
@@ -557,7 +557,7 @@ void HelloTriangleApplication::createRenderPass() {
 	}
 }

-bool HelloTriangleApplication::checkValidationLayerSupport() {
+bool Application::checkValidationLayerSupport() {
 	uint32_t layerCount;
 	vkEnumerateInstanceLayerProperties(&layerCount, nullptr);

@@ -579,7 +579,7 @@ bool HelloTriangleApplication::checkValidationLayerSupport() {
 	return true;
 }

-void HelloTriangleApplication::recordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex) {
+void Application::recordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex) {
 	VkCommandBufferBeginInfo beginInfo{};
 	beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;

@@ -615,7 +615,7 @@ void HelloTriangleApplication::recordCommandBuffer(VkCommandBuffer commandBuffer
 	}
 }

-void HelloTriangleApplication::createSyncObjects() {
+void Application::createSyncObjects() {
 	VkSemaphoreCreateInfo semaphoreInfo{};
 	semaphoreInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;

@@ -630,7 +630,7 @@ void HelloTriangleApplication::createSyncObjects() {
 	}
 }

-void HelloTriangleApplication::drawFrame() {
+void Application::drawFrame() {
 	vkWaitForFences(device, 1, &inFlightFence, VK_TRUE, UINT64_MAX);
 	vkResetFences(device, 1, &inFlightFence);

@@ -680,7 +680,7 @@ void DestroyDebugUtilsMessengerEXT(VkInstance instance, VkDebugUtilsMessengerEXT
 	}
 }

-void HelloTriangleApplication::cleanup() {
+void Application::cleanup() {
 	if (enableValidationLayers) {
 		DestroyDebugUtilsMessengerEXT(instance, debugMessenger, nullptr);
 	}
@@ -1,4 +1,4 @@
-
+
 #pragma once

 #define GLFW_INCLUDE_VULKAN
@@ -21,7 +21,7 @@ struct QueueFamilyIndices {
    }
 };

-class HelloTriangleApplication
+class Application
 {
 private:
    std::vector<char> readFile(const std::string &enginePath)
@@ -113,6 +113,6 @@ private:
    const std::vector<const char*> validationLayers = {
        "VK_LAYER_KHRONOS_validation"
    };
-    const int kWidth = 800;
-    const int kHeight = 600;
+    const int kWidth = 480;
+    const int kHeight = 480;
 };
@@ -1,10 +1,10 @@

-#include "HelloTriangleApplication.h"
+#include "Application.h"



 int main() {
-    HelloTriangleApplication app;
+    Application app;

    try {
        app.run();