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

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);
}