sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split engine to packages NazaraUtils and NZSL (#375)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/VulkanRenderer/Utils.hpp
View File

@@ -9,9 +9,9 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Shader/Enums.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <NZSL/Enums.hpp>
#include <optional>
#include <string>
@@ -39,8 +39,8 @@ namespace Nz
inline VkSamplerMipmapMode ToVulkan(SamplerMipmapMode samplerMipmap);
inline VkSamplerAddressMode ToVulkan(SamplerWrap samplerWrap);
inline VkDescriptorType ToVulkan(ShaderBindingType bindingType);
inline VkShaderStageFlagBits ToVulkan(ShaderStageType stageType);
inline VkShaderStageFlags ToVulkan(ShaderStageTypeFlags stageType);
inline VkShaderStageFlagBits ToVulkan(nzsl::ShaderStageType stageType);
inline VkShaderStageFlags ToVulkan(nzsl::ShaderStageTypeFlags stageType);
inline VkStencilOp ToVulkan(StencilOperation stencilOp);
inline VkImageLayout ToVulkan(TextureLayout textureLayout);
inline VkImageUsageFlagBits ToVulkan(TextureUsage textureLayout);

14
include/Nazara/VulkanRenderer/Utils.inl
View File

@@ -389,24 +389,24 @@ namespace Nz
return VK_DESCRIPTOR_TYPE_SAMPLER;
}
inline VkShaderStageFlagBits ToVulkan(ShaderStageType stageType)
inline VkShaderStageFlagBits ToVulkan(nzsl::ShaderStageType stageType)
{
switch (stageType)
{
case ShaderStageType::Fragment: return VK_SHADER_STAGE_FRAGMENT_BIT;
case ShaderStageType::Vertex: return VK_SHADER_STAGE_VERTEX_BIT;
case nzsl::ShaderStageType::Fragment: return VK_SHADER_STAGE_FRAGMENT_BIT;
case nzsl::ShaderStageType::Vertex: return VK_SHADER_STAGE_VERTEX_BIT;
}
NazaraError("Unhandled ShaderStageType 0x" + NumberToString(UnderlyingCast(stageType), 16));
NazaraError("Unhandled nzsl::ShaderStageType 0x" + NumberToString(UnderlyingCast(stageType), 16));
return {};
}
inline VkShaderStageFlags ToVulkan(ShaderStageTypeFlags stageType)
inline VkShaderStageFlags ToVulkan(nzsl::ShaderStageTypeFlags stageType)
{
VkShaderStageFlags shaderStageBits = 0;
for (int i = 0; i <= UnderlyingCast(ShaderStageType::Max); ++i)
for (int i = 0; i <= UnderlyingCast(nzsl::ShaderStageType::Max); ++i)
{
ShaderStageType shaderStage = static_cast<ShaderStageType>(i);
nzsl::ShaderStageType shaderStage = static_cast<nzsl::ShaderStageType>(i);
if (stageType.Test(shaderStage))
shaderStageBits |= ToVulkan(shaderStage);
}

2
include/Nazara/VulkanRenderer/VulkanCommandPool.hpp
View File

@@ -8,11 +8,11 @@
#define NAZARA_VULKANRENDERER_VULKANCOMMANDPOOL_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Bitset.hpp>
#include <Nazara/Renderer/CommandPool.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/VulkanCommandBuffer.hpp>
#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
#include <Nazara/Utils/Bitset.hpp>
#include <vector>
namespace Nz

4
include/Nazara/VulkanRenderer/VulkanDevice.hpp
View File

@@ -32,8 +32,8 @@ namespace Nz
std::shared_ptr<RenderPass> InstantiateRenderPass(std::vector<RenderPass::Attachment> attachments, std::vector<RenderPass::SubpassDescription> subpassDescriptions, std::vector<RenderPass::SubpassDependency> subpassDependencies) override;
std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override;
std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override;
std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags stages, const ShaderAst::Module& shaderModule, const ShaderWriter::States& states) override;
std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags stages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const ShaderWriter::States& states) override;
std::shared_ptr<ShaderModule> InstantiateShaderModule(nzsl::ShaderStageTypeFlags stages, const nzsl::Ast::Module& shaderModule, const nzsl::ShaderWriter::States& states) override;
std::shared_ptr<ShaderModule> InstantiateShaderModule(nzsl::ShaderStageTypeFlags stages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const nzsl::ShaderWriter::States& states) override;
std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) override;
std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) override;

2
include/Nazara/VulkanRenderer/VulkanRenderPass.hpp
View File

@@ -8,10 +8,10 @@
#define NAZARA_VULKANRENDERER_VULKANRENDERPASS_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Signal.hpp>
#include <Nazara/Renderer/RenderPass.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
#include <Nazara/Utils/Signal.hpp>
#include <vector>
namespace Nz

2
include/Nazara/VulkanRenderer/VulkanRenderPipeline.hpp
View File

@@ -9,12 +9,12 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/Renderer/RenderPipeline.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/VulkanRenderPass.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Pipeline.hpp>
#include <Nazara/Utils/MovablePtr.hpp>
#include <vector>
namespace Nz

2
include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp
View File

@@ -8,7 +8,6 @@
#define NAZARA_VULKANRENDERER_VULKANRENDERPIPELINELAYOUT_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Bitset.hpp>
#include <Nazara/Renderer/RenderPipelineLayout.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/VulkanShaderBinding.hpp>
@@ -17,6 +16,7 @@
#include <Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp>
#include <Nazara/Utils/Bitset.hpp>
#include <memory>
#include <type_traits>
#include <vector>

10
include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
View File

@@ -10,9 +10,9 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Renderer/ShaderModule.hpp>
#include <Nazara/Shader/ShaderWriter.hpp>
#include <Nazara/Shader/Ast/Module.hpp>
#include <Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp>
#include <NZSL/ShaderWriter.hpp>
#include <NZSL/Ast/Module.hpp>
#include <vector>
namespace Nz
@@ -27,8 +27,8 @@ namespace Nz
VulkanShaderModule(VulkanShaderModule&&) = delete;
~VulkanShaderModule() = default;
bool Create(Vk::Device& device, ShaderStageTypeFlags shaderStages, const ShaderAst::Module& shaderModule, const ShaderWriter::States& states);
bool Create(Vk::Device& device, ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const ShaderWriter::States& states);
bool Create(Vk::Device& device, nzsl::ShaderStageTypeFlags shaderStages, const nzsl::Ast::Module& shaderModule, const nzsl::ShaderWriter::States& states);
bool Create(Vk::Device& device, nzsl::ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const nzsl::ShaderWriter::States& states);
inline const Vk::ShaderModule& GetHandle() const;
inline const std::vector<Stage>& GetStages() const;
@@ -38,7 +38,7 @@ namespace Nz
struct Stage
{
ShaderStageType stage;
nzsl::ShaderStageType stage;
std::string name;
};

2
include/Nazara/VulkanRenderer/VulkanUploadPool.hpp
View File

@@ -8,10 +8,10 @@
#define NAZARA_VULKANRENDERER_VULKANUPLOADPOOL_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/Renderer/UploadPool.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Buffer.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp>
#include <Nazara/Utils/MovablePtr.hpp>
#include <optional>
#include <vector>

2
include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp
View File

@@ -8,8 +8,8 @@
#define NAZARA_VULKANRENDERER_WRAPPER_DEVICEMEMORY_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
#include <Nazara/Utils/MovablePtr.hpp>
namespace Nz
{

2
include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
View File

@@ -8,8 +8,8 @@
#define NAZARA_VULKANRENDERER_WRAPPER_DEVICEOBJECT_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <Nazara/Utils/MovablePtr.hpp>
#include <vulkan/vulkan_core.h>
#include <string>

2
include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp
View File

@@ -8,8 +8,8 @@
#define NAZARA_VULKANRENDERER_WRAPPER_INSTANCEOBJECT_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
#include <Nazara/Utils/MovablePtr.hpp>
#include <vulkan/vulkan_core.h>
#include <string>

2
include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp
View File

@@ -8,8 +8,8 @@
#define NAZARA_VULKANRENDERER_WRAPPER_QUEUEHANDLE_HPP
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <Nazara/Utils/MovablePtr.hpp>
#include <vulkan/vulkan_core.h>
namespace Nz

2
include/Nazara/VulkanRenderer/Wrapper/QueueHandle.inl
View File

@@ -4,8 +4,8 @@
#include <Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/StackArray.hpp>
#include <Nazara/VulkanRenderer/Utils.hpp>
#include <Nazara/Utils/StackArray.hpp>
#include <Nazara/VulkanRenderer/Debug.hpp>
namespace Nz