From 309fd547e1b23bbf2d4b117da22b0bbd08f51e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 7 Jul 2021 22:16:22 +0200 Subject: [PATCH] Fix compilation errors and warnings --- examples/Std140Debug/main.cpp | 2 +- .../OpenGLRenderer/Wrapper/DeviceObject.inl | 1 + src/Nazara/Core/Hash/Whirlpool.cpp | 4 ++-- src/Nazara/Network/AlgorithmNetwork.cpp | 2 +- src/Nazara/Network/ENetHost.cpp | 12 ++++++------ src/Nazara/Network/ENetPeer.cpp | 16 ++++++++-------- src/Nazara/Network/Win32/IpAddressImpl.cpp | 4 ++-- src/Nazara/Network/Win32/SocketImpl.cpp | 2 +- .../OpenGLRenderer/OpenGLCommandBuffer.cpp | 12 ++++++++++-- src/Nazara/OpenGLRenderer/OpenGLRenderWindow.cpp | 4 ++-- src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp | 2 +- src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp | 1 - src/Nazara/Shader/Ast/AstSerializer.cpp | 1 - src/Nazara/VulkanRenderer/VulkanTexture.cpp | 5 +++-- 14 files changed, 38 insertions(+), 30 deletions(-) diff --git a/examples/Std140Debug/main.cpp b/examples/Std140Debug/main.cpp index 4cbe0c1ed..dcab63b9b 100644 --- a/examples/Std140Debug/main.cpp +++ b/examples/Std140Debug/main.cpp @@ -130,7 +130,7 @@ int main() std::vector uniformIndices = program.GetActiveUniformBlockUniformIndices(blockIndex); - std::vector offsets = program.GetActiveUniforms(uniformIndices.size(), reinterpret_cast(uniformIndices.data()), GL_UNIFORM_OFFSET); + std::vector offsets = program.GetActiveUniforms(GLsizei(uniformIndices.size()), reinterpret_cast(uniformIndices.data()), GL_UNIFORM_OFFSET); auto p = SortIndexes(offsets, std::less()); diff --git a/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.inl b/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.inl index c92a83c61..9bd7ad465 100644 --- a/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.inl +++ b/include/Nazara/OpenGLRenderer/Wrapper/DeviceObject.inl @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/src/Nazara/Core/Hash/Whirlpool.cpp b/src/Nazara/Core/Hash/Whirlpool.cpp index 6980a5ad3..35641ada2 100644 --- a/src/Nazara/Core/Hash/Whirlpool.cpp +++ b/src/Nazara/Core/Hash/Whirlpool.cpp @@ -910,7 +910,7 @@ namespace Nz bufferBits = bufferPos = 0; // reset buffer } - buffer[bufferPos] = b << (8 - bufferRem); + buffer[bufferPos] = static_cast(b << (8 - bufferRem)); bufferBits += bufferRem; // proceed to remaining data @@ -945,7 +945,7 @@ namespace Nz bufferBits = bufferPos = 0; // reset buffer } - buffer[bufferPos] = b << (8 - bufferRem); + buffer[bufferPos] = UInt8(b << (8 - bufferRem)); bufferBits += len; } diff --git a/src/Nazara/Network/AlgorithmNetwork.cpp b/src/Nazara/Network/AlgorithmNetwork.cpp index 4b3972aac..97cb2a905 100644 --- a/src/Nazara/Network/AlgorithmNetwork.cpp +++ b/src/Nazara/Network/AlgorithmNetwork.cpp @@ -330,7 +330,7 @@ namespace Nz if (value > 65535) // must be 16 bit quantity return false; - *(resultPtr++) = value >> 8; + *(resultPtr++) = static_cast(value >> 8); *(resultPtr++) = value & 0xFF; if (*addressPtr == ':') // typical case inside; carry on diff --git a/src/Nazara/Network/ENetHost.cpp b/src/Nazara/Network/ENetHost.cpp index 92ddcdd49..ecd33112a 100644 --- a/src/Nazara/Network/ENetHost.cpp +++ b/src/Nazara/Network/ENetHost.cpp @@ -831,7 +831,7 @@ namespace Nz command.header.channelID = acknowledgement.command.header.channelID; command.header.reliableSequenceNumber = reliableSequenceNumber; command.acknowledge.receivedReliableSequenceNumber = reliableSequenceNumber; - command.acknowledge.receivedSentTime = HostToNet(acknowledgement.sentTime); + command.acknowledge.receivedSentTime = HostToNet(UInt16(acknowledgement.sentTime)); if ((acknowledgement.command.header.command & ENetProtocolCommand_Mask) == ENetProtocolCommand_Disconnect) peer->DispatchState(ENetPeerState::Zombie); @@ -1219,7 +1219,7 @@ namespace Nz void ENetHost::ThrottleBandwidth() { - UInt32 currentTime = GetElapsedMilliseconds(); + UInt32 currentTime = UInt32(GetElapsedMilliseconds()); UInt32 elapsedTime = currentTime - m_bandwidthThrottleEpoch; if (elapsedTime < ENetConstants::ENetHost_BandwidthThrottleInterval) @@ -1230,8 +1230,8 @@ namespace Nz if (m_connectedPeers == 0) return; - UInt32 dataTotal = ~0; - UInt32 bandwidth = ~0; + UInt32 dataTotal = ~UInt32(0); + UInt32 bandwidth = ~UInt32(0); if (m_outgoingBandwidth != 0) { @@ -1248,8 +1248,8 @@ namespace Nz } UInt32 peersRemaining = m_connectedPeers; - UInt32 bandwidthLimit = ~0; - UInt32 throttle = ~0; + UInt32 bandwidthLimit = ~UInt32(0); + UInt32 throttle = ~UInt32(0); bool needsAdjustment = m_bandwidthLimitedPeers > 0; while (peersRemaining > 0 && needsAdjustment) diff --git a/src/Nazara/Network/ENetPeer.cpp b/src/Nazara/Network/ENetPeer.cpp index 0f9954847..e994f2986 100644 --- a/src/Nazara/Network/ENetPeer.cpp +++ b/src/Nazara/Network/ENetPeer.cpp @@ -267,7 +267,7 @@ namespace Nz command.sendUnreliable.dataLength = HostToNet(UInt16(packetRef->data.GetDataSize())); } - QueueOutgoingCommand(command, packetRef, 0, packetSize); + QueueOutgoingCommand(command, packetRef, 0, UInt16(packetSize)); return true; } @@ -355,7 +355,7 @@ namespace Nz channel.incomingReliableSequenceNumber = incomingCommand.reliableSequenceNumber; if (incomingCommand.fragments.GetSize() > 0) - channel.incomingReliableSequenceNumber += incomingCommand.fragments.GetSize() - 1; + channel.incomingReliableSequenceNumber += static_cast(incomingCommand.fragments.GetSize() - 1); } if (currentCommand == channel.incomingReliableCommands.begin()) @@ -608,7 +608,7 @@ namespace Nz ENetPeer::Channel& channel = m_channels[command->header.channelID]; UInt32 startSequenceNumber = NetToHost(command->sendFragment.startSequenceNumber); - UInt16 startWindow = startSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize; + UInt16 startWindow = UInt16(startSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize); UInt16 currentWindow = channel.incomingReliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize; if (startSequenceNumber < channel.incomingReliableSequenceNumber) @@ -656,7 +656,7 @@ namespace Nz if (!startCommand) { ENetProtocol hostCommand = *command; - hostCommand.header.reliableSequenceNumber = startSequenceNumber; + hostCommand.header.reliableSequenceNumber = static_cast(startSequenceNumber); startCommand = QueueIncomingCommand(hostCommand, nullptr, totalLength, ENetPacketFlag_Reliable, fragmentCount); if (!startCommand) @@ -727,7 +727,7 @@ namespace Nz UInt32 reliableSequenceNumber = command->header.reliableSequenceNumber; UInt32 startSequenceNumber = NetToHost(command->sendFragment.startSequenceNumber); - UInt16 reliableWindow = reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize; + UInt16 reliableWindow = UInt16(reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize); UInt16 currentWindow = channel.incomingReliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize; if (startSequenceNumber < channel.incomingReliableSequenceNumber) @@ -829,7 +829,7 @@ namespace Nz if (unsequencedGroup - index != m_incomingUnsequencedGroup) { - m_incomingUnsequencedGroup = unsequencedGroup - index; + m_incomingUnsequencedGroup = static_cast(unsequencedGroup - index); m_unsequencedWindow.fill(0); } @@ -1120,7 +1120,7 @@ namespace Nz if ((command.header.command & ENetProtocolCommand_Mask) != ENetProtocolCommand_SendUnsequenced) { reliableSequenceNumber = command.header.reliableSequenceNumber; - reliableWindow = reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize; + reliableWindow = static_cast(reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize); currentWindow = channel.incomingReliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize; if (reliableSequenceNumber < channel.incomingReliableSequenceNumber) @@ -1225,7 +1225,7 @@ namespace Nz if (m_totalWaitingData >= m_host->m_maximumWaitingData) return nullptr; - ENetPacketRef packet = m_host->AllocatePacket(flags); + ENetPacketRef packet = m_host->AllocatePacket(ENetPacketFlags(flags)); packet->data.Reset(0, data, dataLength); IncomingCommmand incomingCommand; diff --git a/src/Nazara/Network/Win32/IpAddressImpl.cpp b/src/Nazara/Network/Win32/IpAddressImpl.cpp index 3f2913f69..d66875387 100644 --- a/src/Nazara/Network/Win32/IpAddressImpl.cpp +++ b/src/Nazara/Network/Win32/IpAddressImpl.cpp @@ -264,8 +264,8 @@ namespace Nz for (unsigned int i = 0; i < 8; ++i) { u_short addressPart = htons(address[i]); - socketAddress->sin6_addr.s6_addr[i * 2 + 0] = addressPart >> 0; - socketAddress->sin6_addr.s6_addr[i * 2 + 1] = addressPart >> 8; + socketAddress->sin6_addr.s6_addr[i * 2 + 0] = static_cast(addressPart >> 0); + socketAddress->sin6_addr.s6_addr[i * 2 + 1] = static_cast(addressPart >> 8); } return sizeof(sockaddr_in6); diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp index 27f9b9ca2..37828a4f9 100644 --- a/src/Nazara/Network/Win32/SocketImpl.cpp +++ b/src/Nazara/Network/Win32/SocketImpl.cpp @@ -452,7 +452,7 @@ namespace Nz #endif } - SocketState SocketImpl::PollConnection(SocketHandle handle, const IpAddress& address, UInt64 msTimeout, SocketError* error) + SocketState SocketImpl::PollConnection(SocketHandle handle, const IpAddress& /*address*/, UInt64 msTimeout, SocketError* error) { // Wait until socket is available for writing or an error occurs (ie when connection succeeds or fails) WSAPOLLFD descriptor; diff --git a/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp b/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp index bd375a49b..127b1b22f 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLCommandBuffer.cpp @@ -126,6 +126,9 @@ namespace Nz const auto& attachmentInfo = command.renderpass->GetAttachment(i); switch (PixelFormatInfo::GetContent(attachmentInfo.format)) { + case PixelFormatContent::Undefined: + break; + case PixelFormatContent::ColorRGBA: colorIndexes[colorIndex++] = i; break; @@ -139,6 +142,12 @@ namespace Nz if (!depthStencilIndex) depthStencilIndex = i; break; + + case PixelFormatContent::Stencil: + //FIXME: I'm not sure stencil is properly handled here + if (!depthStencilIndex) + depthStencilIndex = i; + break; } } @@ -164,7 +173,7 @@ namespace Nz context->glClearBufferfv(GL_COLOR, GLint(i), clearColor.data()); } else if (attachmentInfo.loadOp == AttachmentLoadOp::Discard) - invalidateAttachments.push_back(GL_COLOR_ATTACHMENT0 + i); + invalidateAttachments.push_back(static_cast(GL_COLOR_ATTACHMENT0 + i)); } if (depthStencilIndex) @@ -210,7 +219,6 @@ namespace Nz if (colorIndex > 0) { - std::size_t colorBufferCount = command.framebuffer->GetColorBufferCount(); assert(colorBufferCount <= 1); std::size_t colorAttachmentIndex = colorIndexes.front(); diff --git a/src/Nazara/OpenGLRenderer/OpenGLRenderWindow.cpp b/src/Nazara/OpenGLRenderer/OpenGLRenderWindow.cpp index 1b82325ba..eec44c6fd 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLRenderWindow.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLRenderWindow.cpp @@ -35,14 +35,14 @@ namespace Nz return RenderFrame(m_renderImage[m_currentFrame].get(), invalidateFramebuffer, m_size, 0); } - bool OpenGLRenderWindow::Create(RendererImpl* renderer, RenderSurface* surface, const RenderWindowParameters& parameters) + bool OpenGLRenderWindow::Create(RendererImpl* /*renderer*/, RenderSurface* surface, const RenderWindowParameters& parameters) { DummySurface* dummySurface = static_cast(surface); - OpenGLRenderer* glRenderer = static_cast(renderer); OpenGLDevice& device = static_cast(*m_owner.GetRenderDevice()); GL::ContextParams contextParams; + //TODO: Pass render window parameters to context m_context = device.CreateContext(contextParams, dummySurface->GetWindowHandle()); if (!m_context) diff --git a/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp b/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp index e1417f521..3062f676f 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp @@ -53,7 +53,7 @@ namespace Nz return m_device; } - bool OpenGLRenderer::Prepare(const ParameterList& parameters) + bool OpenGLRenderer::Prepare(const ParameterList& /*parameters*/) { std::unique_ptr loader = SelectLoader(); if (!loader) diff --git a/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp b/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp index 355f03220..21c0e1f4e 100644 --- a/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp +++ b/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp @@ -4,7 +4,6 @@ #include #include -#include "..\..\..\..\include\Nazara\Shader\Ast\AstRecursiveVisitor.hpp" namespace Nz::ShaderAst { diff --git a/src/Nazara/Shader/Ast/AstSerializer.cpp b/src/Nazara/Shader/Ast/AstSerializer.cpp index bc426a133..c31a4e470 100644 --- a/src/Nazara/Shader/Ast/AstSerializer.cpp +++ b/src/Nazara/Shader/Ast/AstSerializer.cpp @@ -551,7 +551,6 @@ namespace Nz::ShaderAst #define NAZARA_SHADERAST_STATEMENT(Node) case NodeType:: Node : node = std::make_unique(); break; #include -#include "..\..\..\..\include\Nazara\Shader\Ast\AstSerializer.hpp" default: throw std::runtime_error("unexpected node type"); } diff --git a/src/Nazara/VulkanRenderer/VulkanTexture.cpp b/src/Nazara/VulkanRenderer/VulkanTexture.cpp index c0e775764..200ffad84 100644 --- a/src/Nazara/VulkanRenderer/VulkanTexture.cpp +++ b/src/Nazara/VulkanRenderer/VulkanTexture.cpp @@ -19,7 +19,8 @@ namespace Nz m_device(device), m_params(params) { - VkImageCreateInfo createInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO }; + VkImageCreateInfo createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; createInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; createInfo.mipLevels = params.mipmapLevel; createInfo.samples = VK_SAMPLE_COUNT_1_BIT; @@ -207,7 +208,7 @@ namespace Nz VK_IMAGE_ASPECT_COLOR_BIT, 0, //< mipLevel 0, //< baseArrayLayer - (m_params.type == ImageType::Cubemap) ? 6 : 1 //< layerCount + UInt32((m_params.type == ImageType::Cubemap) ? 6 : 1) //< layerCount }; VkImageSubresourceRange subresourceRange = { //< FIXME