diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index bac44e15a..ae11a1367 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -66,7 +66,10 @@ jobs: # Build the engine - 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 #- name: Run unit tests diff --git a/include/Nazara/Shader/Ast/Module.hpp b/include/Nazara/Shader/Ast/Module.hpp index be0b9b9e3..2d225c5bd 100644 --- a/include/Nazara/Shader/Ast/Module.hpp +++ b/include/Nazara/Shader/Ast/Module.hpp @@ -28,11 +28,11 @@ namespace Nz::ShaderAst inline Module(UInt32 shaderLangVersion, std::string moduleName = std::string(), const Uuid& moduleId = Uuid::Generate()); inline Module(std::shared_ptr metadata, std::vector importedModules = {}); inline Module(std::shared_ptr metadata, MultiStatementPtr rootNode, std::vector importedModules = {}); - Module(const Module&) = default; + Module(const Module&) = delete; Module(Module&&) noexcept = default; ~Module() = default; - Module& operator=(const Module&) = default; + Module& operator=(const Module&) = delete; Module& operator=(Module&&) noexcept = default; struct ImportedModule diff --git a/src/Nazara/Graphics/ForwardPipelinePass.cpp b/src/Nazara/Graphics/ForwardPipelinePass.cpp index dee3e9fa4..4e8b7c77e 100644 --- a/src/Nazara/Graphics/ForwardPipelinePass.cpp +++ b/src/Nazara/Graphics/ForwardPipelinePass.cpp @@ -57,7 +57,7 @@ namespace Nz Graphics* graphics = Graphics::Instance(); PredefinedLightData lightOffsets = PredefinedLightData::GetOffsets(); - std::size_t lightUboAlignedSize = AlignPow2(lightOffsets.totalSize, graphics->GetRenderDevice()->GetDeviceInfo().limits.minUniformBufferOffsetAlignment); + std::size_t lightUboAlignedSize = AlignPow2(lightOffsets.totalSize, SafeCast(graphics->GetRenderDevice()->GetDeviceInfo().limits.minUniformBufferOffsetAlignment)); UploadPool& uploadPool = renderFrame.GetUploadPool();