mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-19 01:29:21 +02:00
put every include before every import
A header first pulled in through an imported module's global module fragment leaves no include guard in the importing unit - macros do not cross a module boundary - so a later textual include parses it again and MSVC rejects the redefinition. Redoes the betterRenderer sweep with placement that stays out of #if blocks, which is where the previous one dropped <fstream> and broke nvrenderer_d3d12.cpp.
This commit is contained in:
@@ -4,19 +4,6 @@
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include "utilities/Globals_macros.h"
|
||||
import eu07.utilities.globals;
|
||||
import eu07.utilities.logs;
|
||||
#include "config.h"
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
#if LIBMANUL_WITH_VULKAN
|
||||
|
||||
#include <nvrhi/validation.h>
|
||||
|
||||
VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
||||
|
||||
#include "nvrendererbackend.h"
|
||||
#include <queue>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <iostream>
|
||||
@@ -27,6 +14,19 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
||||
#include <string>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
#include "config.h"
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
#if LIBMANUL_WITH_VULKAN
|
||||
|
||||
#include <nvrhi/validation.h>
|
||||
|
||||
import eu07.utilities.globals;
|
||||
import eu07.utilities.logs;
|
||||
VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
||||
|
||||
#include "nvrendererbackend.h"
|
||||
#include <queue>
|
||||
|
||||
#define MA_ERROR_LOG(fmt_str, ...) ErrorLog(fmt::format(fmt_str, __VA_ARGS__))
|
||||
#define MA_INFO_LOG(fmt_str, ...) WriteLog(fmt::format(fmt_str, __VA_ARGS__))
|
||||
|
||||
Reference in New Issue
Block a user