Warwick/new-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

finished image view part of tutorial but found issues when running with address sanitiser

Browse source
This commit is contained in:
Warwick New 2024-12-31 12:41:18 +00:00
parent 7c7c01bdac
commit e59126b873
2 changed files with 58 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -30,6 +30,17 @@ file(GLOB_RECURSE HEADER_FILES
${CMAKE_SOURCE_DIR}/src/*.h) ${CMAKE_SOURCE_DIR}/src/*.h)
add_executable(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES}) add_executable(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES})
## Error on memory address issues in debug mode
#if(CMAKE_BUILD_TYPE MATCHES "Debug")
# set(
# CMAKE_C_FLAGS
# "${CMAKE_C_FLAGS} -Werror -fsanitize=undefined -fsanitize=address"
# )
# target_link_options(${PROJECT_NAME}
# BEFORE PUBLIC -fsanitize=undefined PUBLIC -fsanitize=address
# )
#endif()
# Link Libraries # Link Libraries
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
${GLFW_LIBRARIES} ${GLFW_LIBRARIES}

47
src/main.c
View file

@ -6,6 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include <vulkan/vulkan_core.h> #include <vulkan/vulkan_core.h>
#define GLFW_INCLUDE_VULKAN #define GLFW_INCLUDE_VULKAN
@ -49,8 +50,11 @@ typedef struct Application {
VkQueue presentQueue; VkQueue presentQueue;
VkSwapchainKHR swapChain; VkSwapchainKHR swapChain;
VkImage *swapChainImages; VkImage *swapChainImages;
uint32_t swapChainImageCount;
VkFormat swapChainImageFormat; VkFormat swapChainImageFormat;
VkExtent2D swapChainExtent; VkExtent2D swapChainExtent;
VkImageView *swapChainImageViews;
uint32_t swapChainImageViewCount;
} Application; } Application;
typedef struct SwapChainSupportDetails { typedef struct SwapChainSupportDetails {
@ -566,10 +570,47 @@ void createSwapChain(Application *app) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
vkGetSwapchainImagesKHR(app->device, app->swapChain,
&app->swapChainImageCount, NULL);
app->swapChainImages = malloc(app->swapChainImageCount * sizeof(VkImage));
vkGetSwapchainImagesKHR(app->device, app->swapChain,
&app->swapChainImageCount, app->swapChainImages);
app->swapChainImageFormat = surfaceFormat.format; app->swapChainImageFormat = surfaceFormat.format;
app->swapChainExtent = extent; app->swapChainExtent = extent;
} }
void createImageViews(Application *app) {
app->swapChainImageViewCount = app->swapChainImageCount;
app->swapChainImageViews =
malloc(app->swapChainImageViewCount * sizeof(VkImageView));
for (size_t i = 0; i < app->swapChainImageViewCount; i++) {
VkImageViewCreateInfo createInfo = {0};
createInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
createInfo.image = app->swapChainImages[i];
createInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
createInfo.format = app->swapChainImageFormat;
createInfo.components.r = VK_COMPONENT_SWIZZLE_IDENTITY;
createInfo.components.g = VK_COMPONENT_SWIZZLE_IDENTITY;
createInfo.components.b = VK_COMPONENT_SWIZZLE_IDENTITY;
createInfo.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
createInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
createInfo.subresourceRange.baseMipLevel = 0;
createInfo.subresourceRange.levelCount = 1;
createInfo.subresourceRange.baseArrayLayer = 0;
createInfo.subresourceRange.layerCount = 1;
if (vkCreateImageView(app->device, &createInfo, NULL,
&app->swapChainImageViews[i]) != VK_SUCCESS) {
fprintf(stderr, "Failed to create image views!\n");
exit(EXIT_FAILURE);
}
}
}
void initVulkan(Application *app) { void initVulkan(Application *app) {
createInstance(app); createInstance(app);
setupDebugMessenger(app); setupDebugMessenger(app);
@ -577,6 +618,7 @@ void initVulkan(Application *app) {
pickPhysicalDevice(app); pickPhysicalDevice(app);
createLogicalDevice(app); createLogicalDevice(app);
createSwapChain(app); createSwapChain(app);
createImageViews(app);
} }
void mainLoop(Application *app) { void mainLoop(Application *app) {
@ -586,6 +628,11 @@ void mainLoop(Application *app) {
} }
void cleanup(Application *app) { void cleanup(Application *app) {
for (size_t i = 0; i < app->swapChainImageViewCount; i++) {
vkDestroyImageView(app->device, app->swapChainImageViews[i], NULL);
}
free(app->swapChainImageViews);
free(app->swapChainImages);
vkDestroySwapchainKHR(app->device, app->swapChain, NULL); vkDestroySwapchainKHR(app->device, app->swapChain, NULL);
vkDestroyDevice(app->device, NULL); vkDestroyDevice(app->device, NULL);
if (enableValidationLayers) { if (enableValidationLayers) {