minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

OpenGL3: Use std::vector in VertexType instead of clever lifetime games

This commit is contained in:
numzero 2023-10-11 19:40:49 +03:00 committed by sfan5
parent bcc53e1e1a
commit 645b51a34d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/Irrlicht/OpenGL/Driver.cpp
View File

@ -46,20 +46,20 @@ namespace video
struct VertexType { struct VertexType {
int VertexSize; int VertexSize;
std::initializer_list<VertexAttribute> Attributes; // Extends lifetime when used properly! std::vector<VertexAttribute> Attributes;
}; };
static const VertexAttribute *begin(const VertexType &type) static const VertexAttribute *begin(const VertexType &type)
{ {
return type.Attributes.begin(); return type.Attributes.data();
} }
static const VertexAttribute *end(const VertexType &type) static const VertexAttribute *end(const VertexType &type)
{ {
return type.Attributes.end(); return type.Attributes.data() + type.Attributes.size();
} }
static constexpr VertexType vtStandard = { static const VertexType vtStandard = {
sizeof(S3DVertex), { sizeof(S3DVertex), {
{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)}, {EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)},
{EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Normal)}, {EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Normal)},
@ -71,7 +71,7 @@ namespace video
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Winvalid-offsetof" #pragma GCC diagnostic ignored "-Winvalid-offsetof"
static constexpr VertexType vt2TCoords = { static const VertexType vt2TCoords = {
sizeof(S3DVertex2TCoords), { sizeof(S3DVertex2TCoords), {
{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, Pos)}, {EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, Pos)},
{EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, Normal)}, {EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, Normal)},
@ -81,7 +81,7 @@ namespace video
}, },
}; };
static constexpr VertexType vtTangents = { static const VertexType vtTangents = {
sizeof(S3DVertexTangents), { sizeof(S3DVertexTangents), {
{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Pos)}, {EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Pos)},
{EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Normal)}, {EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Normal)},
@ -104,7 +104,7 @@ namespace video
} }
} }
static constexpr VertexType vt2DImage = { static const VertexType vt2DImage = {
sizeof(S3DVertex), { sizeof(S3DVertex), {
{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)}, {EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)},
{EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex, Color)}, {EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex, Color)},
@ -112,7 +112,7 @@ namespace video
}, },
}; };
static constexpr VertexType vtPrimitive = { static const VertexType vtPrimitive = {
sizeof(S3DVertex), { sizeof(S3DVertex), {
{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)}, {EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)},
{EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex, Color)}, {EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex, Color)},