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

macOS fixes (+ cache deps)

This commit is contained in:
Jérôme Leclercq 2022-03-20 11:29:39 +01:00
parent 26a4dc8f41
commit 63320fa205
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/macos-build.yml vendored
View File

@ -66,7 +66,10 @@ jobs:
# Build the engine # Build the engine
- name: Build Nazara - name: Build Nazara
run: xmake build -v NazaraRenderer && xmake build -v NazaraPhysics2D && xmake build -v NazaraPhysics3D && xmake build -v NazaraGraphics && xmake build -v NazaraAudio && xmake build -v NazaraNetwork run: |
xmake build -v NazaraRenderer
xmake build -v NazaraPhysics2D
xmake build -v NazaraPhysics3D
# Run unit tests # Run unit tests
#- name: Run unit tests #- name: Run unit tests

4
include/Nazara/Shader/Ast/Module.hpp
View File

@ -28,11 +28,11 @@ namespace Nz::ShaderAst
inline Module(UInt32 shaderLangVersion, std::string moduleName = std::string(), const Uuid& moduleId = Uuid::Generate()); inline Module(UInt32 shaderLangVersion, std::string moduleName = std::string(), const Uuid& moduleId = Uuid::Generate());
inline Module(std::shared_ptr<const Metadata> metadata, std::vector<ImportedModule> importedModules = {}); inline Module(std::shared_ptr<const Metadata> metadata, std::vector<ImportedModule> importedModules = {});
inline Module(std::shared_ptr<const Metadata> metadata, MultiStatementPtr rootNode, std::vector<ImportedModule> importedModules = {}); inline Module(std::shared_ptr<const Metadata> metadata, MultiStatementPtr rootNode, std::vector<ImportedModule> importedModules = {});
Module(const Module&) = default; Module(const Module&) = delete;
Module(Module&&) noexcept = default; Module(Module&&) noexcept = default;
~Module() = default; ~Module() = default;
Module& operator=(const Module&) = default; Module& operator=(const Module&) = delete;
Module& operator=(Module&&) noexcept = default; Module& operator=(Module&&) noexcept = default;
struct ImportedModule struct ImportedModule

2
src/Nazara/Graphics/ForwardPipelinePass.cpp
View File

@ -57,7 +57,7 @@ namespace Nz
Graphics* graphics = Graphics::Instance(); Graphics* graphics = Graphics::Instance();
PredefinedLightData lightOffsets = PredefinedLightData::GetOffsets(); PredefinedLightData lightOffsets = PredefinedLightData::GetOffsets();
std::size_t lightUboAlignedSize = AlignPow2(lightOffsets.totalSize, graphics->GetRenderDevice()->GetDeviceInfo().limits.minUniformBufferOffsetAlignment); std::size_t lightUboAlignedSize = AlignPow2(lightOffsets.totalSize, SafeCast<std::size_t>(graphics->GetRenderDevice()->GetDeviceInfo().limits.minUniformBufferOffsetAlignment));
UploadPool& uploadPool = renderFrame.GetUploadPool(); UploadPool& uploadPool = renderFrame.GetUploadPool();