suppress some compiler warning and update tinygltf, stb_image

K1ngst0m · Nov 10, 2023 · 223e172 · 223e172
1 parent 6ab8129
commit 223e172
Show file tree

Hide file tree

Showing 14 changed files with 716 additions and 28,960 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,6 @@ build/
 /external/*
 !/external/backward-cpp
 !/external/reckless
-!/external/stb
-!/external/tinygltf
 !/external/tinyktx
 !/external/volk
 !/external/vulkan

diff --git a/CHANGES b/CHANGES
@@ -26,3 +26,6 @@ Branch: master
 
 [unordered_dense]
 Branch: v4.1.2
+
+[tinygltf]
+Branch: v2.8.18
diff --git a/cmake/AphCompilerOptions.cmake b/cmake/AphCompilerOptions.cmake
@@ -44,8 +44,10 @@ function(aph_compiler_options TARGET)
 
         # setup target compile warning
         target_compile_options(${TARGET} PRIVATE
-          -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic
+          -Wall -Wextra -Wshadow
 
+          # TODO
+          -Wno-non-virtual-dtor
           -Wno-sign-compare -Wcast-align -Wno-missing-field-initializers -Wno-unused-parameter
         )
 

diff --git a/cmake/AphExternal.cmake b/cmake/AphExternal.cmake
@@ -35,6 +35,7 @@ add_subdirectory(${APH_EXTERNAL_DIR}/volk EXCLUDE_FROM_ALL)
 add_subdirectory(${APH_EXTERNAL_DIR}/spirv-cross EXCLUDE_FROM_ALL)
 add_subdirectory(${APH_EXTERNAL_DIR}/imgui EXCLUDE_FROM_ALL)
 add_subdirectory(${APH_EXTERNAL_DIR}/slang EXCLUDE_FROM_ALL)
+add_subdirectory(${APH_EXTERNAL_DIR}/tinygltf EXCLUDE_FROM_ALL)
 add_subdirectory(${APH_EXTERNAL_DIR}/unordered_dense EXCLUDE_FROM_ALL)
 
 find_package(PkgConfig REQUIRED)

diff --git a/engine/api/vulkan/physicalDevice.cpp b/engine/api/vulkan/physicalDevice.cpp
@@ -263,13 +263,13 @@ VkFormat PhysicalDevice::findSupportedFormat(const std::vector<VkFormat>& candid
 
 const std::vector<uint32_t>& PhysicalDevice::getQueueFamilyIndexByFlags(QueueType flags)
 {
-    for (auto i = static_cast<int>(flags); i >= 0; --i)
+    for(auto i = static_cast<int>(flags); i >= 0; --i)
     {
-        QueueType type = static_cast<QueueType>(i);
+        QueueType queueType = static_cast<QueueType>(i);
 
-        if (m_queueFamilyMap.contains(type))
+        if(m_queueFamilyMap.contains(queueType))
         {
-            return m_queueFamilyMap.at(type);
+            return m_queueFamilyMap.at(queueType);
         }
         CM_LOG_WARN("could not found queue type (transfer or compute), fallback to next.");
     }

diff --git a/engine/common/CMakeLists.txt b/engine/common/CMakeLists.txt
@@ -5,5 +5,4 @@ target_include_directories(common PRIVATE
   ${APH_ENGINE_DIR}
   ${APH_EXTERNAL_DIR}/backward-cpp/include
   ${APH_EXTERNAL_DIR}/unordered_dense/include
-  ${APH_EXTERNAL_DIR}/stb/include
 )
diff --git a/engine/common/common.cpp b/engine/common/common.cpp
@@ -1,6 +1,4 @@
 #include "common.h"
-#define STB_IMAGE_IMPLEMENTATION
-#include <stb/stb_image.h>
 
 #define BACKWARD_HAS_DW 1
 #define BACKWARD_HAS_BACKTRACE_SYMBOL 1

diff --git a/engine/resource/CMakeLists.txt b/engine/resource/CMakeLists.txt
@@ -6,8 +6,8 @@ target_include_directories(resource PRIVATE
   ${APH_EXTERNAL_DIR}/volk
   ${APH_EXTERNAL_DIR}/slang
   ${APH_EXTERNAL_DIR}/tinyktx
-  ${APH_EXTERNAL_DIR}/tinygltf/include
   ${APH_EXTERNAL_DIR}/stb/include
+  ${APH_EXTERNAL_DIR}/tinygltf
   ${APH_EXTERNAL_DIR}/unordered_dense/include
 )
 

diff --git a/engine/resource/resourceLoader.cpp b/engine/resource/resourceLoader.cpp
@@ -11,8 +11,9 @@
 #define TINYGLTF_IMPLEMENTATION
 #define TINYGLTF_NO_INCLUDE_STB_IMAGE
 #define TINYGLTF_NO_STB_IMAGE_WRITE
-#include <stb/stb_image.h>
-#include <tinygltf/tiny_gltf.h>
+#define STB_IMAGE_IMPLEMENTATION
+#include "stb/stb_image.h"
+#include "tiny_gltf.h"
 
 #include "filesystem/filesystem.h"