From d676e9a2fb533494d1558483e8266605b1d5b632 Mon Sep 17 00:00:00 2001 From: ladevieq Date: Sun, 10 Jul 2022 17:41:40 +0200 Subject: Thirdparty includes flagged as SYSTEM --- src/CMakeLists.txt | 2 ++ src/gltf.cpp | 2 +- src/main.cpp | 2 +- src/vk-api.cpp | 2 +- src/vk-context.cpp | 4 ++-- src/vk-renderer.cpp | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3d3daeb..86d91d5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,6 +21,8 @@ add_executable( ${Tracy_SOURCE_DIR}/TracyClient.cpp ) +target_include_directories(path-tracer SYSTEM PUBLIC ${CMAKE_SOURCE_DIR}/thirdparty) + target_include_directories(path-tracer PUBLIC ${CMAKE_SOURCE_DIR}/include) target_include_directories(path-tracer PUBLIC ${Vulkan_INCLUDE_DIRS}) diff --git a/src/gltf.cpp b/src/gltf.cpp index c45ba99..282b4a4 100644 --- a/src/gltf.cpp +++ b/src/gltf.cpp @@ -4,7 +4,7 @@ #include #define STB_IMAGE_IMPLEMENTATION -#include "thirdparty/stb_image.h" +#include #include "vk-renderer.hpp" #include "utils.hpp" diff --git a/src/main.cpp b/src/main.cpp index 0b371ae..f61e0f7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,7 +4,7 @@ #include "imgui.h" #ifdef ENABLE_RENDERDOC -#include "thirdparty/renderdoc.h" +#include #endif #include "defines.hpp" diff --git a/src/vk-api.cpp b/src/vk-api.cpp index 5a24eb9..de23b65 100644 --- a/src/vk-api.cpp +++ b/src/vk-api.cpp @@ -1157,7 +1157,7 @@ void vkapi::begin_render_pass(VkCommandBuffer command_buffer, VkRenderPass rende attachment_begin_info.attachmentCount = attachments.size(); attachment_begin_info.pAttachments = attachments.data(); - VkClearValue clear_value = { 0.f, 0.f, 0.f, 1.f }; + VkClearValue clear_value { 0.f, 0.f, 0.f, 1.f }; VkRenderPassBeginInfo render_pass_begin_info = {}; render_pass_begin_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; render_pass_begin_info.pNext = &attachment_begin_info; diff --git a/src/vk-context.cpp b/src/vk-context.cpp index 7876d86..0a5e391 100644 --- a/src/vk-context.cpp +++ b/src/vk-context.cpp @@ -6,7 +6,7 @@ #include "vulkan-loader.hpp" #define VMA_IMPLEMENTATION -#include "thirdparty/vk_mem_alloc.h" +#include #ifdef _DEBUG #define VKRESULT(result) assert(result == VK_SUCCESS); @@ -20,7 +20,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL DebugCallback(VkDebugUtilsMessageSeverityFlagBits void *userData) { std::cerr << data->pMessage << std::endl; - return VK_FALSE; + return VK_FALSE; } diff --git a/src/vk-renderer.cpp b/src/vk-renderer.cpp index daae775..cbdd09f 100644 --- a/src/vk-renderer.cpp +++ b/src/vk-renderer.cpp @@ -164,7 +164,7 @@ void vkrenderer::update_buffer(Buffer* buffer, void* data, off_t offset, size_t Buffer* vkrenderer::create_buffer(size_t size, bool isStatic) { - auto* buffer = new Buffer(this, size, isStatic); + auto* buffer = new Buffer(size, isStatic); buffer->device_buffer = api.create_buffer(isStatic ? size : size * virtual_frames_count, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VMA_MEMORY_USAGE_CPU_TO_GPU); @@ -172,7 +172,7 @@ Buffer* vkrenderer::create_buffer(size_t size, bool isStatic) { } Buffer* vkrenderer::create_index_buffer(size_t size, bool isStatic) { - auto* buffer = new Buffer(this, size, isStatic); + auto* buffer = new Buffer(size, isStatic); buffer->device_buffer = api.create_buffer(isStatic ? size : size * virtual_frames_count, VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VMA_MEMORY_USAGE_CPU_TO_GPU); -- cgit v1.3