Remove VKBP_DISABLE_WARNINGS

KhronosGroup · Mar 11, 2024 · 13273ba · 13273ba
1 parent fb5bb55
commit 13273ba
Show file tree

Hide file tree

Showing 46 changed files with 66 additions and 156 deletions.
diff --git a/app/plugins/file_logger/file_logger.cpp b/app/plugins/file_logger/file_logger.cpp
@@ -1,5 +1,5 @@
-/* Copyright (c) 2021-2023, Arm Limited and Contributors
- * Copyright (c) 2021-2023, Sascha Willems
+/* Copyright (c) 2021-2024, Arm Limited and Contributors
+ * Copyright (c) 2021-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,11 +20,9 @@
 
 #include "apps.h"
 
-VKBP_DISABLE_WARNINGS()
 #include <fmt/format.h>
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/spdlog.h>
-VKBP_ENABLE_WARNINGS()
 
 namespace plugins
 {

diff --git a/components/core/include/core/util/error.hpp b/components/core/include/core/util/error.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2023, Thomas Atkinson
+/* Copyright (c) 2024, Thomas Atkinson
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -50,10 +50,8 @@
 		__pragma(warning(pop))
 #endif
 
-VKBP_DISABLE_WARNINGS()
 // TODO: replace with a direct fmt submodule
 #include <fmt/format.h>
-VKBP_ENABLE_WARNINGS()
 
 #include <stdexcept>
 

diff --git a/components/core/tests/strings.test.cpp b/components/core/tests/strings.test.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2023, Thomas Atkinson
+/* Copyright (c) 2024, Thomas Atkinson
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -17,9 +17,7 @@
 
 #include <core/util/error.hpp>
 
-VKBP_DISABLE_WARNINGS()
 #include <catch2/catch_test_macros.hpp>
-VKBP_ENABLE_WARNINGS()
 
 #include <core/util/strings.hpp>
 

diff --git a/framework/camera.h b/framework/camera.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, Sascha Willems
+/* Copyright (c) 2019-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -19,11 +19,9 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/quaternion.hpp>
-VKBP_ENABLE_WARNINGS()
 
 namespace vkb
 {

diff --git a/framework/common/error.h b/framework/common/error.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023, Arm Limited and Contributors
+/* Copyright (c) 2018-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/framework/common/helpers.h b/framework/common/helpers.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2022, Arm Limited and Contributors
+/* Copyright (c) 2018-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -36,10 +36,8 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
 #include <glm/gtx/hash.hpp>
-VKBP_ENABLE_WARNINGS()
 
 namespace vkb
 {
@@ -102,7 +100,7 @@ inline void read(std::istringstream &is, std::array<T, N> &value)
 }
 
 template <typename T, typename... Args>
-inline void read(std::istringstream &is, T &first_arg, Args &... args)
+inline void read(std::istringstream &is, T &first_arg, Args &...args)
 {
 	read(is, first_arg);
 
@@ -157,7 +155,7 @@ inline void write(std::ostringstream &os, const std::array<T, N> &value)
 }
 
 template <typename T, typename... Args>
-inline void write(std::ostringstream &os, const T &first_arg, const Args &... args)
+inline void write(std::ostringstream &os, const T &first_arg, const Args &...args)
 {
 	write(os, first_arg);
 

diff --git a/framework/common/utils.h b/framework/common/utils.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023, Arm Limited and Contributors
+/* Copyright (c) 2018-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -19,10 +19,8 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
 #include "glm/gtx/quaternion.hpp"
-VKBP_ENABLE_WARNINGS()
 
 #include "platform/filesystem.h"
 #include "rendering/pipeline_state.h"

diff --git a/framework/core/command_buffer.cpp b/framework/core/command_buffer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,7 @@
 #include "rendering/render_frame.h"
 #include "rendering/subpass.h"
 
-VKBP_DISABLE_WARNINGS()
 #include <glm/gtc/type_ptr.hpp>
-VKBP_ENABLE_WARNINGS()
 
 namespace vkb
 {

diff --git a/framework/core/device.cpp b/framework/core/device.cpp
@@ -18,10 +18,8 @@
 
 #include "device.h"
 
-VKBP_DISABLE_WARNINGS()
 #define VMA_IMPLEMENTATION
 #include <vk_mem_alloc.h>
-VKBP_ENABLE_WARNINGS()
 
 namespace vkb
 {

diff --git a/framework/debug_info.h b/framework/debug_info.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,9 +23,7 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
-VKBP_ENABLE_WARNINGS()
 
 #include "common/helpers.h"
 

diff --git a/framework/geometry/frustum.h b/framework/geometry/frustum.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2022, Sascha Willems
+/* Copyright (c) 2019-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -21,9 +21,7 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
-VKBP_ENABLE_WARNINGS()
 
 namespace vkb
 {
@@ -38,7 +36,7 @@ enum Side
 };
 
 /**
- * @brief Represents a matrix by extracting its planes. Responsible for doing 
+ * @brief Represents a matrix by extracting its planes. Responsible for doing
  * intersection tests
  */
 class Frustum

diff --git a/framework/glsl_compiler.cpp b/framework/glsl_compiler.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -17,14 +17,12 @@
 
 #include "glsl_compiler.h"
 
-VKBP_DISABLE_WARNINGS()
 #include <SPIRV/GLSL.std.450.h>
 #include <SPIRV/GlslangToSpv.h>
 #include <StandAlone/DirStackFileIncluder.h>
 #include <glslang/Include/ShHandle.h>
 #include <glslang/OSDependent/osinclude.h>
 #include <glslang/Public/ResourceLimits.h>
-VKBP_ENABLE_WARNINGS()
 
 namespace vkb
 {

diff --git a/framework/glsl_compiler.h b/framework/glsl_compiler.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2020, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -22,9 +22,7 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include <glslang/Public/ShaderLang.h>
-VKBP_ENABLE_WARNINGS()
 
 #include "common/vk_common.h"
 #include "core/shader_module.h"
@@ -64,9 +62,9 @@ class GLSLCompiler
 	 */
 	bool compile_to_spirv(VkShaderStageFlagBits       stage,
 	                      const std::vector<uint8_t> &glsl_source,
-	                      const std::string &         entry_point,
-	                      const ShaderVariant &       shader_variant,
+	                      const std::string          &entry_point,
+	                      const ShaderVariant        &shader_variant,
 	                      std::vector<std::uint32_t> &spirv,
-	                      std::string &               info_log);
+	                      std::string                &info_log);
 };
 }        // namespace vkb
diff --git a/framework/gltf_loader.cpp b/framework/gltf_loader.cpp
@@ -1,5 +1,5 @@
-/* Copyright (c) 2018-2023, Arm Limited and Contributors
- * Copyright (c) 2019-2023, Sascha Willems
+/* Copyright (c) 2018-2024, Arm Limited and Contributors
+ * Copyright (c) 2019-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -24,10 +24,8 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
 #include <glm/gtc/type_ptr.hpp>
-VKBP_ENABLE_WARNINGS()
 
 #include "api_vulkan_sample.h"
 #include "common/logging.h"
@@ -1468,7 +1466,7 @@ std::unique_ptr<sg::Sampler> GLTFLoader::parse_sampler(const tinygltf::Sampler &
 
 	VkSamplerAddressMode address_mode_u = find_wrap_mode(gltf_sampler.wrapS);
 	VkSamplerAddressMode address_mode_v = find_wrap_mode(gltf_sampler.wrapT);
-	VkSamplerAddressMode address_mode_w = find_wrap_mode(gltf_sampler.wrapR);
+	VkSamplerAddressMode address_mode_w = find_wrap_mode(gltf_sampler.wrapT);
 
 	VkSamplerCreateInfo sampler_info{VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO};
 
@@ -1507,7 +1505,7 @@ std::unique_ptr<sg::Sampler> GLTFLoader::create_default_sampler()
 
 	gltf_sampler.wrapS = TINYGLTF_TEXTURE_WRAP_REPEAT;
 	gltf_sampler.wrapT = TINYGLTF_TEXTURE_WRAP_REPEAT;
-	gltf_sampler.wrapR = TINYGLTF_TEXTURE_WRAP_REPEAT;
+	// gltf_sampler.wrapR = TINYGLTF_TEXTURE_WRAP_REPEAT;
 
 	return parse_sampler(gltf_sampler);
 }

diff --git a/framework/gui.cpp b/framework/gui.cpp
@@ -23,10 +23,8 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
 #include <glm/gtc/matrix_transform.hpp>
-VKBP_ENABLE_WARNINGS()
 
 #include "buffer_pool.h"
 #include "common/logging.h"

diff --git a/framework/heightmap.cpp b/framework/heightmap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Sascha Willems
+/* Copyright (c) 2019-2024, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -21,9 +21,7 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include "common/glm_common.h"
-VKBP_ENABLE_WARNINGS()
 
 #include "platform/filesystem.h"
 

diff --git a/framework/platform/android/android_platform.cpp b/framework/platform/android/android_platform.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -25,13 +25,11 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #include <fmt/format.h>
 #include <imgui.h>
 #include <jni.h>
 #include <spdlog/sinks/android_sink.h>
 #include <spdlog/sinks/basic_file_sink.h>
-VKBP_ENABLE_WARNINGS()
 
 #include "apps.h"
 #include "common/logging.h"

diff --git a/framework/platform/filesystem.cpp b/framework/platform/filesystem.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -19,10 +19,8 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include <stb_image_write.h>
-VKBP_ENABLE_WARNINGS()
 
 #include "platform/platform.h"
 

diff --git a/framework/platform/glfw_window.cpp b/framework/platform/glfw_window.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2023, Arm Limited and Contributors
+/* Copyright (c) 2019-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -21,13 +21,11 @@
 
 #include "common/error.h"
 
-VKBP_DISABLE_WARNINGS()
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <GLFW/glfw3native.h>
 #include <fmt/format.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
-VKBP_ENABLE_WARNINGS()
 
 #include "common/logging.h"
 #include "platform/platform.h"