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

Upgrade Utility

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-24 19:10:53 +02:00
parent b936946154
commit cce32a64d4
120 changed files with 2328 additions and 2971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Nazara/VulkanRenderer/VkRenderWindow.cpp
View File

@@ -159,32 +159,32 @@ namespace Nz
{
switch (format)
{
case PixelFormat_Depth16:
case PixelFormat::Depth16:
m_depthStencilFormat = VK_FORMAT_D16_UNORM;
break;
case PixelFormat_Depth24:
case PixelFormat_Depth24Stencil8:
case PixelFormat::Depth24:
case PixelFormat::Depth24Stencil8:
m_depthStencilFormat = VK_FORMAT_D24_UNORM_S8_UINT;
break;
case PixelFormat_Depth32:
case PixelFormat::Depth32:
m_depthStencilFormat = VK_FORMAT_D32_SFLOAT;
break;
case PixelFormat_Stencil1:
case PixelFormat_Stencil4:
case PixelFormat_Stencil8:
case PixelFormat::Stencil1:
case PixelFormat::Stencil4:
case PixelFormat::Stencil8:
m_depthStencilFormat = VK_FORMAT_S8_UINT;
break;
case PixelFormat_Stencil16:
case PixelFormat::Stencil16:
continue;
default:
{
PixelFormatContent formatContent = PixelFormatInfo::GetContent(format);
if (formatContent != PixelFormatContent_DepthStencil && formatContent != PixelFormatContent_Stencil)
if (formatContent != PixelFormatContent::DepthStencil && formatContent != PixelFormatContent::Stencil)
NazaraWarning("Invalid format " + PixelFormatInfo::GetName(format) + " for depth-stencil attachment");
m_depthStencilFormat = VK_FORMAT_MAX_ENUM;

16
src/Nazara/VulkanRenderer/VulkanBuffer.cpp
View File

@@ -18,7 +18,7 @@ namespace Nz
bool VulkanBuffer::Fill(const void* data, UInt64 offset, UInt64 size)
{
void* ptr = Map(BufferAccess_WriteOnly, offset, size);
void* ptr = Map(BufferAccess::WriteOnly, offset, size);
if (!ptr)
return false;
@@ -36,7 +36,7 @@ namespace Nz
VkBufferUsageFlags bufferUsage = ToVulkan(m_type);
if ((usage & BufferUsage_DirectMapping) == 0)
if ((usage & BufferUsage::DirectMapping) == 0)
bufferUsage |= VK_BUFFER_USAGE_TRANSFER_DST_BIT;
VkBufferCreateInfo createInfo = {};
@@ -45,9 +45,9 @@ namespace Nz
createInfo.usage = bufferUsage;
VmaAllocationCreateInfo allocInfo = {};
if (usage & BufferUsage_DeviceLocal)
if (usage & BufferUsage::DeviceLocal)
{
if (usage & BufferUsage_DirectMapping)
if (usage & BufferUsage::DirectMapping)
allocInfo.usage = VMA_MEMORY_USAGE_CPU_TO_GPU;
else
allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
@@ -55,7 +55,7 @@ namespace Nz
else
allocInfo.usage = VMA_MEMORY_USAGE_CPU_ONLY;
if (usage & BufferUsage_PersistentMapping)
if (usage & BufferUsage::PersistentMapping)
allocInfo.flags |= VMA_ALLOCATION_CREATE_MAPPED_BIT;
VkResult result = vmaCreateBuffer(m_device.GetMemoryAllocator(), &createInfo, &allocInfo, &m_buffer, &m_allocation, nullptr);
@@ -75,12 +75,12 @@ namespace Nz
DataStorage VulkanBuffer::GetStorage() const
{
return DataStorage_Hardware;
return DataStorage::Hardware;
}
void* VulkanBuffer::Map(BufferAccess /*access*/, UInt64 offset, UInt64 size)
{
if (m_usage & BufferUsage_DirectMapping)
if (m_usage & BufferUsage::DirectMapping)
{
void* mappedPtr;
VkResult result = vmaMapMemory(m_device.GetMemoryAllocator(), m_allocation, &mappedPtr);
@@ -118,7 +118,7 @@ namespace Nz
bool VulkanBuffer::Unmap()
{
if (m_usage & BufferUsage_DirectMapping)
if (m_usage & BufferUsage::DirectMapping)
{
vmaUnmapMemory(m_device.GetMemoryAllocator(), m_allocation);
return true;

2
src/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.cpp
View File

@@ -58,7 +58,7 @@ namespace Nz
const auto& values = (i < clearValueCount) ? clearValues[i] : CommandBufferBuilder::ClearValues{};
auto& vkValues = vkClearValues[i];
if (PixelFormatInfo::GetContent(vkRenderPass.GetAttachment(i).format) == PixelFormatContent_ColorRGBA)
if (PixelFormatInfo::GetContent(vkRenderPass.GetAttachment(i).format) == PixelFormatContent::ColorRGBA)
{
vkValues.color.float32[0] = values.color.r / 255.f;
vkValues.color.float32[1] = values.color.g / 255.f;

36
src/Nazara/VulkanRenderer/VulkanTexture.cpp
View File

@@ -39,7 +39,7 @@ namespace Nz
switch (params.type)
{
case ImageType_1D:
case ImageType::E1D:
NazaraAssert(params.width > 0, "Width must be over zero");
createInfoView.viewType = VK_IMAGE_VIEW_TYPE_1D;
@@ -51,7 +51,7 @@ namespace Nz
createInfo.arrayLayers = 1;
break;
case ImageType_1D_Array:
case ImageType::E1D_Array:
NazaraAssert(params.width > 0, "Width must be over zero");
NazaraAssert(params.height > 0, "Height must be over zero");
@@ -64,7 +64,7 @@ namespace Nz
createInfo.arrayLayers = params.height;
break;
case ImageType_2D:
case ImageType::E2D:
NazaraAssert(params.width > 0, "Width must be over zero");
NazaraAssert(params.height > 0, "Height must be over zero");
@@ -77,7 +77,7 @@ namespace Nz
createInfo.arrayLayers = 1;
break;
case ImageType_2D_Array:
case ImageType::E2D_Array:
NazaraAssert(params.width > 0, "Width must be over zero");
NazaraAssert(params.height > 0, "Height must be over zero");
NazaraAssert(params.depth > 0, "Depth must be over zero");
@@ -91,7 +91,7 @@ namespace Nz
createInfo.arrayLayers = params.depth;
break;
case ImageType_3D:
case ImageType::E3D:
NazaraAssert(params.width > 0, "Width must be over zero");
NazaraAssert(params.height > 0, "Height must be over zero");
NazaraAssert(params.depth > 0, "Depth must be over zero");
@@ -105,7 +105,7 @@ namespace Nz
createInfo.arrayLayers = 1;
break;
case ImageType_Cubemap:
case ImageType::Cubemap:
NazaraAssert(params.width > 0, "Width must be over zero");
NazaraAssert(params.height > 0, "Height must be over zero");
@@ -230,22 +230,22 @@ namespace Nz
// TODO: Fill this switch
switch (pixelFormat)
{
case PixelFormat_BGR8:
case PixelFormat_BGR8_SRGB:
case PixelFormat_BGRA8:
case PixelFormat_BGRA8_SRGB:
case PixelFormat_RGB8:
case PixelFormat_RGB8_SRGB:
case PixelFormat_RGBA8:
case PixelFormat_RGBA8_SRGB:
case PixelFormat_RGBA32F:
case PixelFormat::BGR8:
case PixelFormat::BGR8_SRGB:
case PixelFormat::BGRA8:
case PixelFormat::BGRA8_SRGB:
case PixelFormat::RGB8:
case PixelFormat::RGB8_SRGB:
case PixelFormat::RGBA8:
case PixelFormat::RGBA8_SRGB:
case PixelFormat::RGBA32F:
{
createImage.format = ToVulkan(pixelFormat);
createImageView.format = createImage.format;
break;
}
case PixelFormat_Depth24Stencil8:
case PixelFormat::Depth24Stencil8:
{
createImage.format = VK_FORMAT_D24_UNORM_S8_UINT;
createImageView.format = createImage.format;
@@ -253,7 +253,7 @@ namespace Nz
break;
}
case PixelFormat_L8:
case PixelFormat::L8:
{
createImage.format = VK_FORMAT_R8_UNORM;
createImageView.format = createImage.format;
@@ -266,7 +266,7 @@ namespace Nz
break;
}
case PixelFormat_LA8:
case PixelFormat::LA8:
{
createImage.format = VK_FORMAT_R8G8_UNORM;
createImageView.format = createImage.format;