Split engine to packages NazaraUtils and NZSL (#375)

* Move code to NazaraUtils and NZSL packages

* Reorder includes

* Tests: Remove glslang and spirv-tools deps

* Tests: Remove glslang init

* Remove NazaraUtils tests and fix Vector4Test

* Fix Linux compilation

* Update msys2-build.yml

* Fix assimp package

* Update xmake.lua

* Update xmake.lua

* Fix shader compilation on MinGW

* Final fixes

* The final fix 2: the fix strikes back!

* Disable cache on CI

* The return of the fix™️
This commit is contained in:
Jérôme Leclercq
2022-05-25 19:36:10 +02:00
committed by GitHub
parent 3f8f1c4653
commit 03e2801dbe
483 changed files with 1139 additions and 59112 deletions

View File

@@ -486,6 +486,8 @@ on_run(function ()
order = 1 -- top engine includes
elseif inclusions[i].path == "Nazara/" .. debugIncludeModule .. "/Debug.hpp" then
order = 6 -- debug include
elseif inclusions[i].path:match("^Nazara/Utils/") then
order = 2.1 -- NazaraUtils
elseif inclusions[i].path:match("^Nazara/") then
order = 2 -- engine includes
elseif IsSystemHeader(inclusions[i].path) then

View File

@@ -0,0 +1,27 @@
task("compile-shaders")
set_menu({
-- Settings menu usage
usage = "xmake compile-shaders [options]",
description = "Compile engine shaders"
})
on_run(function ()
import("core.project.project")
local nzsl = path.join(project.required_package("nzsl"):installdir(), "bin", "nzslc")
local envs
if is_plat("mingw") then
local mingw = toolchain.load("mingw")
if mingw and mingw:check() then
envs = mingw:runenvs()
end
end
print("Compiling shaders...")
for _, filepath in pairs(os.files("src/Nazara/*/Resources/**.nzsl")) do
print(" - Compiling " .. filepath)
local argv = {"--compile=nzslb", "--partial", "--header-file", filepath }
os.execv(nzsl, argv, { envs = envs })
end
end)

View File

@@ -1,21 +0,0 @@
task("compile-shaders")
set_menu({
-- Settings menu usage
usage = "xmake compile-shaders [options]",
description = "Compile engine shaders"
})
on_run(function ()
import("core.project.task")
print("Compiling NZSLC...")
task.run("build", {target = "NazaraShaderCompiler"})
print("Compiling shaders...")
for _, filepath in pairs(os.files("src/Nazara/*/Resources/**.nzsl")) do
print(" - Compiling " .. filepath)
local argv = {"--compile", "--partial", "--header-file", path.join("..", "..", filepath) }
task.run("run", {target = "NazaraShaderCompiler", arguments = argv})
end
end)

View File

@@ -74,8 +74,6 @@ on_run(function ()
paths["Core"].Excludes["ECS.hpp"] = true
paths["OpenGLRenderer"].Excludes["Wrapper.hpp"] = true
paths["Shader"].Excludes["ShaderLangErrorList.hpp"] = true
paths["Shader"].Excludes["ShaderLangTokenList.hpp"] = true
paths["VulkanRenderer"].Excludes["Wrapper.hpp"] = true
-- OpenGL renderer wrapper

View File

@@ -84,8 +84,8 @@ on_run(function()
#define NAZARA_SHADER_SPIRVDATA_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Flags.hpp>
#include <Nazara/Shader/Config.hpp>
#include <Nazara/Utils/Bitset.hpp>
#include <NZSL/Config.hpp>
namespace Nz
{
@@ -226,11 +226,11 @@ headerFile:write([[
// this file was automatically generated and should not be edited
#include <Nazara/Shader/SpirvData.hpp>
#include <NZSL/SpirvData.hpp>
#include <algorithm>
#include <array>
#include <cassert>
#include <Nazara/Shader/Debug.hpp>
#include <NZSL/Debug.hpp>
namespace Nz
{