17
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-19 00:19:19 +02:00

hoist standard includes above everything else

Ordering them before the imports in the same file was not enough: a
project header on line 1 can import a module several levels down whose
global module fragment already pulled in the same standard header, and
that include guard does not cross the module boundary. Putting them
first means the guard is set before anything can import.

Skips vendored single-header libraries and anything inside an #if.
This commit is contained in:
maj00r
2026-09-10 01:02:17 +02:00
parent cfd1c1f318
commit 26501b0fd7
52 changed files with 154 additions and 155 deletions

View File

@@ -1,15 +1,15 @@
#include "shader_compiler.hpp"
#include <fstream>
#include <iostream>
#include "utils.hpp"
#include <cstdint>
#include <filesystem>
#include <fstream>
#include <iostream>
#include <string>
#include <tuple>
#include <unordered_map>
#include <vector>
#include "shader_compiler.hpp"
#include "utils.hpp"
int MaShaderCompiler::Run() {
ParseOptions();

View File

@@ -1,9 +1,12 @@
#pragma once
#include <filesystem>
#include <string>
#include <tuple>
#include <vector>
#include <nvrhi/nvrhi.h>
#include <yaml-cpp/yaml.h>
#include <filesystem>
#ifndef _WIN32
#include <WinAdapter.h>
@@ -11,9 +14,6 @@
#include <Windows.h>
#endif
#include <dxcapi.h>
#include <string>
#include <tuple>
#include <vector>
template <typename T>
using RefCountPtr = nvrhi::RefCountPtr<T>;

View File

@@ -1,9 +1,9 @@
#pragma once
#include <cstdint>
#include <string>
#include <yaml-cpp/yaml.h>
#include <string>
#include <cstdint>
inline std::wstring ToWide(const std::string& str) {
std::wstring wstr{};

View File

@@ -1,10 +1,23 @@
#pragma once
//STL includes required by EU07 includes
#include <array>
#include <condition_variable>
#include <cstddef>
#include <cstdint>
#include <deque>
#include <stdexcept>
#include <functional>
#include <future>
#include <memory>
#include <mutex>
#include <optional>
#include <stdexcept>
#include <string>
#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <variant>
#include <vector>
#include <math.h>
// OpenGL includes required by EU07 includes
@@ -18,23 +31,10 @@
#include <yaml-cpp/yaml.h>
#include <entt/container/dense_map.hpp>
#include <future>
#include <mutex>
// EU07 includes. This header is consumed by translation units that include
// nothing else, so everything it names has to be imported here rather than
// relied on to arrive from the including file.
#include <array>
#include <condition_variable>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <optional>
#include <string>
#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <vector>
#include "nvrenderer_enums.h"
#include "quadtree.h"

View File

@@ -1,11 +1,11 @@
#pragma once
#include <nvrhi/nvrhi.h>
#include <entt/entt.hpp>
#include <cstddef>
#include <cstdint>
#include <memory>
#include <nvrhi/nvrhi.h>
#include <entt/entt.hpp>
import eu07.glm;
class NvTextureManager;

View File

@@ -1,3 +1,4 @@
#include <cstdint>
#include "auto_exposure.h"
#include <nvrhi/utils.h>
@@ -5,7 +6,6 @@
#include "config.h"
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <cstdint>
MaAutoExposure::MaAutoExposure(NvRenderer *renderer)
: MaResourceRegistry(renderer), m_backend(renderer->GetBackend()) {}

View File

@@ -1,9 +1,9 @@
#pragma once
#include <cstdint>
#include "nvrenderer/resource_registry.h"
#include <nvrhi/nvrhi.h>
#include <cstdint>
class NvRenderer;
class NvRendererBackend;

View File

@@ -1,7 +1,7 @@
#pragma once
#include <nvrhi/nvrhi.h>
#include <vector>
#include <nvrhi/nvrhi.h>
import eu07.glm;
struct Bloom {

View File

@@ -1,10 +1,10 @@
#include <filesystem>
#include <string>
#include <vector>
#include "config.h"
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <filesystem>
#include <string>
#include <vector>
void MaConfig::Init(const std::filesystem::path& config_file) {
Init(YAML::LoadFile(config_file.generic_string()));

View File

@@ -1,11 +1,11 @@
#pragma once
#include <yaml-cpp/yaml.h>
#include <filesystem>
#include <array>
#include <filesystem>
#include <string>
#include <vector>
#include <yaml-cpp/yaml.h>
struct MaConfig {
enum MaTonemapType { Default_Srgb = 0, Linear_Rec2020 };

View File

@@ -1,3 +1,4 @@
#include <cstdint>
#include "contactshadows.h"
#include <nvrhi/utils.h>
@@ -5,7 +6,6 @@
#include "gbuffer.h"
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <cstdint>
MaContactShadows::MaContactShadows(NvRenderer* renderer, NvGbuffer* gbuffer)
: m_backend(renderer->GetBackend()),

View File

@@ -1,7 +1,7 @@
#pragma once
#include <nvrhi/nvrhi.h>
#include <cstdint>
#include <nvrhi/nvrhi.h>
import eu07.glm;
struct MaContactShadows {

View File

@@ -1,3 +1,5 @@
#include <limits>
#include <vector>
#include "csm.h"
#include <nvrhi/utils.h>
@@ -5,8 +7,6 @@
#include "config.h"
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <limits>
#include <vector>
MaShadowMap::MaShadowMap(NvRenderer* renderer)
: MaResourceRegistry(renderer), m_backend(renderer->m_backend.get()) {}

View File

@@ -1,10 +1,10 @@
#pragma once
#include <array>
#include <vector>
#include <nvrhi/nvrhi.h>
#include "nvrenderer/resource_registry.h"
#include <array>
#include <vector>
struct MaShadowMap : public MaResourceRegistry {
MaShadowMap(class NvRenderer* renderer);

View File

@@ -1,3 +1,9 @@
#include <cstddef>
#include <cstdint>
#include <map>
#include <memory>
#include <string>
#include <utility>
#include "environment.h"
#include <fmt/format.h>
@@ -8,12 +14,6 @@
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include "nvtexture.h"
#include <cstddef>
#include <cstdint>
#include <map>
#include <memory>
#include <string>
#include <utility>
#include "sky.h"
import eu07.simulation.simulationenvironment;

View File

@@ -1,12 +1,12 @@
#pragma once
#include "fullscreenpass.h"
#include "nvrenderer/resource_registry.h"
#include "nvrhi/nvrhi.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <string>
#include "fullscreenpass.h"
#include "nvrenderer/resource_registry.h"
#include "nvrhi/nvrhi.h"
struct MaEnvironment : public MaResourceRegistry {
nvrhi::TextureHandle m_skybox;

View File

@@ -1,3 +1,4 @@
#include <queue>
#include "fsr.h"
#if LIBMANUL_WITH_D3D12
@@ -16,7 +17,6 @@
#include "utilities/Globals_macros.h"
#include "gbuffer.h"
#include "gbufferblitpass.h"
#include <queue>
import eu07.utilities.globals;
import eu07.glm;

View File

@@ -1,10 +1,10 @@
#pragma once
#include <cstddef>
#include <string>
#include <ffx-fsr2-api/ffx_fsr2.h>
#include "nvrendererbackend.h"
#include <cstddef>
#include <string>
import eu07.glm;
struct NvFSR {

View File

@@ -1,10 +1,10 @@
#include <cstdint>
#include "gbuffer.h"
#include <nvrhi/utils.h>
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <cstdint>
NvGbuffer::NvGbuffer(NvRenderer* renderer)
: m_backend(renderer->m_backend.get()) {}

View File

@@ -1,8 +1,8 @@
#pragma once
#include <nvrhi/nvrhi.h>
#include <cstdint>
#include <vector>
#include <nvrhi/nvrhi.h>
struct NvGbuffer {
NvGbuffer(class NvRenderer* renderer);

View File

@@ -1,6 +1,6 @@
#include <chrono>
#include "gbufferblitpass.h"
#include <chrono>
#include <nvrhi/utils.h>
#include "contactshadows.h"

View File

@@ -1,3 +1,4 @@
#include <cstdint>
#include "gbufferlighting.h"
#include <nvrhi/utils.h>
@@ -7,7 +8,6 @@
#include "nvrendererbackend.h"
#include "ssao.h"
#include "config.h"
#include <cstdint>
import eu07.glm;
void GbufferLighting::Init() {

View File

@@ -1,10 +1,10 @@
#pragma once
#include <nvrenderer/nvrenderer.h>
#include <nvrhi/nvrhi.h>
#include <cstddef>
#include <cstdint>
#include <vector>
#include <nvrenderer/nvrenderer.h>
#include <nvrhi/nvrhi.h>
import eu07.glm;

View File

@@ -44,6 +44,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include <cstdint>
#include <stddef.h>
#include <imgui.h>
@@ -53,7 +54,6 @@ SOFTWARE.
#include "imgui_nvrhi.h"
#include "nvrendererbackend.h"
#include "config.h"
#include <cstdint>
struct VERTEX_CONSTANT_BUFFER
{

View File

@@ -46,16 +46,16 @@ SOFTWARE.
#pragma once
#include <cstddef>
#include <memory>
#include <vector>
#include <unordered_map>
#include <vector>
#include <stdint.h>
#include <nvrhi/nvrhi.h>
#include <imgui/imgui.h>
#include "nvtexture.h"
#include <cstddef>
struct ImGui_NVRHI
{

View File

@@ -1,11 +1,11 @@
#pragma once
#include "nvrenderer/nvrenderer.h"
#include <cstddef>
#include <cstdint>
#include <functional>
#include <unordered_map>
#include <vector>
#include "nvrenderer/nvrenderer.h"
struct InstanceCacheId {
gfx::geometry_handle m_geometry;

View File

@@ -1,11 +1,11 @@
#include "ddspp/ddspp.h"
#include "nvtexture.h"
#include <sstream>
#include <cstddef>
#include <cstdint>
#include <ios>
#include <sstream>
#include <string>
#include "ddspp/ddspp.h"
#include "nvtexture.h"
bool NvTexture::LoadDDS(std::string &data, int size_bias) {
ddspp::Descriptor desc{};

View File

@@ -1,17 +1,17 @@
#include <filesystem>
#include <memory>
#include <optional>
#include <sstream>
#include <string>
#include <utility>
#include "materialparser.h"
#include "nvrenderer/nvrenderer.h"
#include "utilities/Globals_macros.h"
#include <memory>
#include <optional>
#include <sstream>
#include <utility>
#include <fmt/format.h>
#include "utilities/utilities_macros.h"
#include <yaml-cpp/yaml.h>
#include <string>
#include <filesystem>
import eu07.utilities.globals;
import eu07.utilities.logs;

View File

@@ -1,12 +1,11 @@
#pragma once
#include <memory>
#include <string>
#include <string_view>
#include <optional>
#include <unordered_map>
#include <string>
#include <unordered_map>
#include <string_view>
import eu07.glm;
struct MaterialAdapterInternal {

View File

@@ -1,15 +1,15 @@
#include "nvmaterial.h"
#include "nvrenderer/nvrenderer.h"
#include <fmt/format.h>
#include <nvrhi/utils.h>
#include <array>
#include <cstddef>
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
#include "nvmaterial.h"
#include "nvrenderer/nvrenderer.h"
#include <fmt/format.h>
#include <nvrhi/utils.h>
#include "csm.h"
#include "environment.h"
#include "gbuffer.h"

View File

@@ -1,9 +1,8 @@
#include "nvrenderer/nvrenderer.h"
#include <array>
#include <array>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <future>
#include <limits>
#include <memory>
#include <mutex>
@@ -11,8 +10,9 @@
#include <string>
#include <utility>
#include <vector>
#include "nvrenderer/nvrenderer.h"
#include <nvrhi/utils.h>
#include <future>
#include "auto_exposure.h"
#include "bloom.h"
#include "config.h"

View File

@@ -1,12 +1,12 @@
#include <fstream>
#include <ios>
#include <memory>
#include <string>
#include "nvrenderer_d3d12.h"
#include <fmt/format.h>
#include "utilities/Globals_macros.h"
#include <fstream>
#include <ios>
#include <memory>
#include <string>
#include "config.h"
#include "nvrenderer/nvrenderer.h"

View File

@@ -1,11 +1,11 @@
#pragma once
#include <string>
#include <vector>
#include <nvrhi/nvrhi.h>
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <string>
#include <vector>
#if LIBMANUL_WITH_D3D12

View File

@@ -1,8 +1,8 @@
#pragma once
#include <memory>
#include "imgui_nvrhi.h"
#include "nvrenderer/nvrenderer.h"
#include <memory>
class NvImguiRenderer : public imgui_renderer {
virtual bool Init() override;

View File

@@ -1,9 +1,3 @@
#include "nvrenderer_vulkan.h"
#include <GLFW/glfw3.h>
#include <fmt/format.h>
#include "utilities/Globals_macros.h"
#include <cstddef>
#include <cstdint>
#include <iostream>
@@ -14,6 +8,12 @@
#include <string>
#include <unordered_set>
#include <vector>
#include "nvrenderer_vulkan.h"
#include <GLFW/glfw3.h>
#include <fmt/format.h>
#include "utilities/Globals_macros.h"
#include "config.h"
#include "nvrenderer/nvrenderer.h"

View File

@@ -1,13 +1,13 @@
#pragma once
#include <nvrhi/nvrhi.h>
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <cstdint>
#include <string>
#include <unordered_set>
#include <vector>
#include <nvrhi/nvrhi.h>
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#if LIBMANUL_WITH_VULKAN

View File

@@ -1,8 +1,8 @@
#include "nvrendererbackend.h"
#include <cstddef>
#include <string>
#include <unordered_map>
#include "nvrendererbackend.h"
#include <fmt/format.h>
import eu07.utilities.logs;

View File

@@ -1,12 +1,12 @@
#pragma once
#include <nvrhi/nvrhi.h>
#include "nvrenderer/nvrenderer.h"
#include <array>
#include <string>
#include <unordered_map>
#include <vector>
#include <nvrhi/nvrhi.h>
#include "nvrenderer/nvrenderer.h"
struct ShaderDefine {
std::string m_name;

View File

@@ -1,8 +1,4 @@
#include "nvtexture.h"
#include "nvrenderer/nvrenderer.h"
#include "utilities/Globals_macros.h"
#include <array>
#include <array>
#include <cstddef>
#include <cstdint>
#include <fstream>
@@ -11,6 +7,10 @@
#include <sstream>
#include <string>
#include <utility>
#include "nvtexture.h"
#include "nvrenderer/nvrenderer.h"
#include "utilities/Globals_macros.h"
#include <fmt/format.h>
#include "utilities/utilities_macros.h"
#include "nvrendererbackend.h"

View File

@@ -1,16 +1,16 @@
#pragma once
#include <bitset>
#include <cstddef>
#include <cstdint>
#include <memory>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>
#include <nvrhi/nvrhi.h>
#include "global_include/interfaces/ITexture_macros.h"
#include <cstddef>
#include <cstdint>
#include <string>
#include <utility>
#include <vector>
#include "nvrenderer/nvrenderer_enums.h"
import eu07.global_include.interfaces.itexture;

View File

@@ -1,7 +1,7 @@
#include "nvrenderer/quadtree.h"
#include <cstdint>
#include <limits>
#include <memory>
#include "nvrenderer/quadtree.h"
void QuadTreeBuilder::Node::Insert(uint32_t index, glm::dvec3 min_,
glm::dvec3 max_, int level) {

View File

@@ -1,10 +1,10 @@
#include "nvrenderer/resource_registry.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <stdexcept>
#include <string>
#include "nvrenderer/resource_registry.h"
#include "fmt/compile.h"
#include "nvtexture.h"
#include "nvrenderer/nvrenderer.h"

View File

@@ -1,3 +1,10 @@
#include <array>
#include <cstddef>
#include <limits>
#include <memory>
#include <tuple>
#include <unordered_map>
#include <vector>
#include "rt_model.h"
#include <bvh/v2/bvh.h>
@@ -7,14 +14,7 @@
#include <bvh/v2/thread_pool.h>
#include <bvh/v2/tri.h>
#include <vector>
#include <array>
#include <cstddef>
#include <limits>
#include <memory>
#include <tuple>
#include <unordered_map>
import eu07.simcore;
namespace Rt {

View File

@@ -1,7 +1,7 @@
#include <string>
#include <yaml-cpp/yaml.h>
#include "nvrenderer_d3d12.h"
#include <string>
#if LIBMANUL_WITH_D3D12

View File

@@ -1,8 +1,8 @@
#include <queue>
#include <string>
#include <yaml-cpp/yaml.h>
#include "nvrenderer_vulkan.h"
#include <queue>
#include <string>
#if LIBMANUL_WITH_VULKAN

View File

@@ -1,12 +1,12 @@
#include <array>
#include <limits>
#include <memory>
#include "sky.h"
#include <nvrhi/utils.h>
#include "environment.h"
#include "nvrendererbackend.h"
#include <array>
#include <limits>
#include <memory>
#include "imgui/imgui.h"
import eu07.simulation.simulationenvironment;

View File

@@ -1,8 +1,8 @@
#pragma once
#include <memory>
#include "fullscreenpass.h"
#include "nvrenderer/resource_registry.h"
#include <memory>
struct Sky : public MaResourceRegistry {
Sky(class NvRenderer* renderer, struct MaEnvironment *environment);

View File

@@ -1,3 +1,5 @@
#include <array>
#include <cstddef>
#include "ssao.h"
#include <nvrhi/nvrhi.h>
@@ -9,8 +11,6 @@
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include "imgui/imgui.h"
#include <array>
#include <cstddef>
import eu07.glm;
NvSsao::NvSsao(NvRenderer* renderer)

View File

@@ -1,12 +1,12 @@
#pragma once
#include <nvrhi/nvrhi.h>
#include <memory>
#include "XeGTAO.h"
#include <array>
#include <cstddef>
#include <memory>
#include <nvrhi/nvrhi.h>
#include "XeGTAO.h"
import eu07.glm;
struct NvSsao {

View File

@@ -1,10 +1,4 @@
#include "config.h"
#include "gbufferblitpass.h"
#include "motioncache.h"
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include <cstddef>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <limits>
@@ -13,6 +7,12 @@
#include <unordered_map>
#include <utility>
#include <vector>
#include "config.h"
#include "gbufferblitpass.h"
#include "motioncache.h"
#include "nvrenderer/nvrenderer.h"
#include "nvrendererbackend.h"
#include "utilities/utilities_macros.h"
import eu07.utilities.timer;
import eu07.simcore;

View File

@@ -1,3 +1,4 @@
#include <cstddef>
#include "windshield_rain.h"
#include "gbuffer.h"
@@ -5,7 +6,6 @@
#include "nvrendererbackend.h"
#include "nvrhi/utils.h"
#include "nvtexture.h"
#include <cstddef>
void WindshieldRain::Init(NvRenderer* in_renderer) {
renderer = in_renderer;

View File

@@ -1,9 +1,9 @@
#pragma once
#include "nvrenderer/nvrenderer.h"
#include <cstddef>
#include <cstdint>
#include <unordered_map>
#include "nvrenderer/nvrenderer.h"
struct WindshieldRain {
void Init(NvRenderer *in_renderer);