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

Move FieldOffsets class to Shader module and remove Utility dependency

Browse Source
This commit is contained in:
SirLynix
2022-04-04 19:22:18 +02:00
parent 998bcde2e2
commit 68d2dfcae6
21 changed files with 117 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
include/Nazara/Utility/Enums.hpp
View File

@@ -166,20 +166,6 @@ namespace Nz
Max = CounterClockwise
};
enum class ImageType
{
E1D,
E1D_Array,
E2D,
E2D_Array,
E3D,
Cubemap,
Max = Cubemap
};
constexpr std::size_t ImageTypeCount = static_cast<std::size_t>(ImageType::Max) + 1;
enum class IndexType
{
U8,
@@ -351,60 +337,6 @@ namespace Nz
Max = Repeat
};
enum class ShaderStageType
{
Fragment,
Vertex,
Max = Vertex
};
constexpr std::size_t ShaderStageTypeCount = static_cast<std::size_t>(ShaderStageType::Max) + 1;
template<>
struct EnumAsFlags<ShaderStageType>
{
static constexpr ShaderStageType max = ShaderStageType::Max;
};
using ShaderStageTypeFlags = Flags<ShaderStageType>;
constexpr ShaderStageTypeFlags ShaderStageType_All = ShaderStageType::Fragment | ShaderStageType::Vertex;
enum class StructFieldType
{
Bool1,
Bool2,
Bool3,
Bool4,
Float1,
Float2,
Float3,
Float4,
Double1,
Double2,
Double3,
Double4,
Int1,
Int2,
Int3,
Int4,
UInt1,
UInt2,
UInt3,
UInt4,
Max = UInt4
};
enum class StructLayout
{
Packed,
Std140,
Max = Std140
};
enum class StencilOperation
{
Decrement,

52
include/Nazara/Utility/FieldOffsets.hpp
View File

@@ -1,52 +0,0 @@
// Copyright (C) 2022 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Utility module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once
#ifndef NAZARA_UTILITY_FIELDOFFSETS_HPP
#define NAZARA_UTILITY_FIELDOFFSETS_HPP
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Enums.hpp>
namespace Nz
{
class NAZARA_UTILITY_API FieldOffsets
{
public:
inline FieldOffsets(StructLayout layout);
FieldOffsets(const FieldOffsets&) = default;
FieldOffsets(FieldOffsets&&) = default;
~FieldOffsets() = default;
std::size_t AddField(StructFieldType type);
std::size_t AddFieldArray(StructFieldType type, std::size_t arraySize);
std::size_t AddMatrix(StructFieldType cellType, unsigned int columns, unsigned int rows, bool columnMajor);
std::size_t AddMatrixArray(StructFieldType cellType, unsigned int columns, unsigned int rows, bool columnMajor, std::size_t arraySize);
std::size_t AddStruct(const FieldOffsets& fieldStruct);
std::size_t AddStructArray(const FieldOffsets& fieldStruct, std::size_t arraySize);
inline std::size_t GetAlignedSize() const;
inline std::size_t GetLargestFieldAlignement() const;
inline StructLayout GetLayout() const;
inline std::size_t GetSize() const;
FieldOffsets& operator=(const FieldOffsets&) = default;
FieldOffsets& operator=(FieldOffsets&&) = default;
static std::size_t GetAlignement(StructLayout layout, StructFieldType fieldType);
static std::size_t GetCount(StructFieldType fieldType);
static std::size_t GetSize(StructFieldType fieldType);
private:
std::size_t m_largestFieldAlignment;
std::size_t m_offsetRounding;
std::size_t m_size;
StructLayout m_layout;
};
}
#include <Nazara/Utility/FieldOffsets.inl>
#endif // NAZARA_UTILITY_FIELDOFFSETS_HPP

174
include/Nazara/Utility/FieldOffsets.inl
View File

@@ -1,174 +0,0 @@
// Copyright (C) 2022 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Utility module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/FieldOffsets.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <cassert>
#include <memory>
#include <Nazara/Utility/Debug.hpp>
namespace Nz
{
inline FieldOffsets::FieldOffsets(StructLayout layout) :
m_largestFieldAlignment(1),
m_offsetRounding(1),
m_size(0),
m_layout(layout)
{
}
inline std::size_t FieldOffsets::GetLargestFieldAlignement() const
{
return m_largestFieldAlignment;
}
inline StructLayout FieldOffsets::GetLayout() const
{
return m_layout;
}
inline std::size_t FieldOffsets::GetAlignedSize() const
{
if (m_layout == StructLayout::Std140)
return Align(m_size, m_largestFieldAlignment);
else
return m_size;
}
inline std::size_t FieldOffsets::GetSize() const
{
return m_size;
}
inline std::size_t FieldOffsets::GetAlignement(StructLayout layout, StructFieldType fieldType)
{
switch (layout)
{
case StructLayout::Packed:
return 1;
case StructLayout::Std140:
{
switch (fieldType)
{
case StructFieldType::Bool1:
case StructFieldType::Float1:
case StructFieldType::Int1:
case StructFieldType::UInt1:
return 4;
case StructFieldType::Bool2:
case StructFieldType::Float2:
case StructFieldType::Int2:
case StructFieldType::UInt2:
return 2 * 4;
case StructFieldType::Bool3:
case StructFieldType::Float3:
case StructFieldType::Int3:
case StructFieldType::UInt3:
case StructFieldType::Bool4:
case StructFieldType::Float4:
case StructFieldType::Int4:
case StructFieldType::UInt4:
return 4 * 4;
case StructFieldType::Double1:
return 8;
case StructFieldType::Double2:
return 2 * 8;
case StructFieldType::Double3:
case StructFieldType::Double4:
return 4 * 8;
}
}
}
return 0;
}
inline std::size_t FieldOffsets::GetCount(StructFieldType fieldType)
{
switch (fieldType)
{
case StructFieldType::Bool1:
case StructFieldType::Double1:
case StructFieldType::Float1:
case StructFieldType::Int1:
case StructFieldType::UInt1:
return 1;
case StructFieldType::Bool2:
case StructFieldType::Double2:
case StructFieldType::Float2:
case StructFieldType::Int2:
case StructFieldType::UInt2:
return 2;
case StructFieldType::Bool3:
case StructFieldType::Double3:
case StructFieldType::Float3:
case StructFieldType::Int3:
case StructFieldType::UInt3:
return 3;
case StructFieldType::Bool4:
case StructFieldType::Double4:
case StructFieldType::Float4:
case StructFieldType::Int4:
case StructFieldType::UInt4:
return 4;
}
return 0;
}
inline std::size_t FieldOffsets::GetSize(StructFieldType fieldType)
{
switch (fieldType)
{
case StructFieldType::Bool1:
case StructFieldType::Float1:
case StructFieldType::Int1:
case StructFieldType::UInt1:
return 4;
case StructFieldType::Bool2:
case StructFieldType::Float2:
case StructFieldType::Int2:
case StructFieldType::UInt2:
return 2 * 4;
case StructFieldType::Bool3:
case StructFieldType::Float3:
case StructFieldType::Int3:
case StructFieldType::UInt3:
return 3 * 4;
case StructFieldType::Bool4:
case StructFieldType::Float4:
case StructFieldType::Int4:
case StructFieldType::UInt4:
return 4 * 4;
case StructFieldType::Double1:
return 8;
case StructFieldType::Double2:
return 2 * 8;
case StructFieldType::Double3:
return 3 * 8;
case StructFieldType::Double4:
return 4 * 8;
}
return 0;
}
}
#include <Nazara/Utility/DebugOff.hpp>