Improve pipeline building
This commit is contained in:
Lynix
@@ -106,86 +106,216 @@ namespace Nz
|
||||
});
|
||||
|
||||
NazaraAssert(s_declarations[VertexLayout_XY_Color]->GetStride() == sizeof(VertexStruct_XY_Color), "Invalid stride for declaration VertexLayout_XY_Color");
|
||||
/*
|
||||
|
||||
// VertexLayout_XY_UV : VertexStruct_XY_UV
|
||||
declaration = &s_declarations[VertexLayout_XY_UV];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float2, NazaraOffsetOf(VertexStruct_XY_UV, position));
|
||||
declaration->EnableComponent(VertexComponent_TexCoord, ComponentType_Float2, NazaraOffsetOf(VertexStruct_XY_UV, uv));
|
||||
s_declarations[VertexLayout_XY_UV] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float2,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_TexCoord,
|
||||
ComponentType_Float2,
|
||||
0
|
||||
},
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XY_UV), "Invalid stride for declaration VertexLayout_XY_UV");
|
||||
NazaraAssert(s_declarations[VertexLayout_XY_UV]->GetStride() == sizeof(VertexStruct_XY_UV), "Invalid stride for declaration VertexLayout_XY_UV");
|
||||
|
||||
// VertexLayout_XYZ : VertexStruct_XYZ
|
||||
declaration = &s_declarations[VertexLayout_XYZ];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ, position));
|
||||
s_declarations[VertexLayout_XYZ] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ), "Invalid stride for declaration VertexLayout_XYZ");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ]->GetStride() == sizeof(VertexStruct_XYZ), "Invalid stride for declaration VertexLayout_XYZ");
|
||||
|
||||
// VertexLayout_XYZ_Color : VertexStruct_XYZ_Color
|
||||
declaration = &s_declarations[VertexLayout_XYZ_Color];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Color, position));
|
||||
declaration->EnableComponent(VertexComponent_Color, ComponentType_Color, NazaraOffsetOf(VertexStruct_XYZ_Color, color));
|
||||
s_declarations[VertexLayout_XYZ_Color] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Color,
|
||||
ComponentType_Color,
|
||||
0
|
||||
}
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ_Color), "Invalid stride for declaration VertexLayout_XYZ_Color");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ_Color]->GetStride() == sizeof(VertexStruct_XYZ_Color), "Invalid stride for declaration VertexLayout_XYZ_Color");
|
||||
|
||||
// VertexLayout_XYZ_Color_UV : VertexStruct_XYZ_Color_UV
|
||||
declaration = &s_declarations[VertexLayout_XYZ_Color_UV];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Color_UV, position));
|
||||
declaration->EnableComponent(VertexComponent_Color, ComponentType_Color, NazaraOffsetOf(VertexStruct_XYZ_Color_UV, color));
|
||||
declaration->EnableComponent(VertexComponent_TexCoord, ComponentType_Float2, NazaraOffsetOf(VertexStruct_XYZ_Color_UV, uv));
|
||||
s_declarations[VertexLayout_XYZ_Color_UV] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Color,
|
||||
ComponentType_Color,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_TexCoord,
|
||||
ComponentType_Float2,
|
||||
0
|
||||
},
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ_Color_UV), "Invalid stride for declaration VertexLayout_XYZ_Color_UV");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ_Color_UV]->GetStride() == sizeof(VertexStruct_XYZ_Color_UV), "Invalid stride for declaration VertexLayout_XYZ_Color_UV");
|
||||
|
||||
// VertexLayout_XYZ_Normal : VertexStruct_XYZ_Normal
|
||||
declaration = &s_declarations[VertexLayout_XYZ_Normal];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal, position));
|
||||
declaration->EnableComponent(VertexComponent_Normal, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal, normal));
|
||||
s_declarations[VertexLayout_XYZ_Normal] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Normal,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
}
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ_Normal), "Invalid stride for declaration VertexLayout_XYZ_Normal");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ_Normal]->GetStride() == sizeof(VertexStruct_XYZ_Normal), "Invalid stride for declaration VertexLayout_XYZ_Normal");
|
||||
|
||||
// VertexLayout_XYZ_Normal_UV : VertexStruct_XYZ_Normal_UV
|
||||
declaration = &s_declarations[VertexLayout_XYZ_Normal_UV];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV, position));
|
||||
declaration->EnableComponent(VertexComponent_Normal, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV, normal));
|
||||
declaration->EnableComponent(VertexComponent_TexCoord, ComponentType_Float2, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV, uv));
|
||||
s_declarations[VertexLayout_XYZ_Normal_UV] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Normal,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_TexCoord,
|
||||
ComponentType_Float2,
|
||||
0
|
||||
}
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ_Normal_UV), "Invalid stride for declaration VertexLayout_XYZ_Normal_UV");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ_Normal_UV]->GetStride() == sizeof(VertexStruct_XYZ_Normal_UV), "Invalid stride for declaration VertexLayout_XYZ_Normal_UV");
|
||||
|
||||
// VertexLayout_XYZ_Normal_UV_Tangent : VertexStruct_XYZ_Normal_UV_Tangent
|
||||
declaration = &s_declarations[VertexLayout_XYZ_Normal_UV_Tangent];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent, position));
|
||||
declaration->EnableComponent(VertexComponent_Normal, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent, normal));
|
||||
declaration->EnableComponent(VertexComponent_TexCoord, ComponentType_Float2, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent, uv));
|
||||
declaration->EnableComponent(VertexComponent_Tangent, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent, tangent));
|
||||
s_declarations[VertexLayout_XYZ_Normal_UV_Tangent] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Normal,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_TexCoord,
|
||||
ComponentType_Float2,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Tangent,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
}
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ_Normal_UV_Tangent), "Invalid stride for declaration VertexLayout_XYZ_Normal_UV_Tangent");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ_Normal_UV_Tangent]->GetStride() == sizeof(VertexStruct_XYZ_Normal_UV_Tangent), "Invalid stride for declaration VertexLayout_XYZ_Normal_UV_Tangent");
|
||||
|
||||
// VertexLayout_XYZ_Normal_UV_Tangent_Skinning : VertexStruct_XYZ_Normal_UV_Tangent_Skinning
|
||||
declaration = &s_declarations[VertexLayout_XYZ_Normal_UV_Tangent_Skinning];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent_Skinning, position));
|
||||
declaration->EnableComponent(VertexComponent_Normal, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent_Skinning, normal));
|
||||
declaration->EnableComponent(VertexComponent_TexCoord, ComponentType_Float2, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent_Skinning, uv));
|
||||
declaration->EnableComponent(VertexComponent_Tangent, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent_Skinning, tangent));
|
||||
declaration->EnableComponent(VertexComponent_Unused, ComponentType_Int1, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent_Skinning, weightCount));
|
||||
declaration->EnableComponent(VertexComponent_Userdata0, ComponentType_Float4, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent_Skinning, weights));
|
||||
declaration->EnableComponent(VertexComponent_Userdata1, ComponentType_Int4, NazaraOffsetOf(VertexStruct_XYZ_Normal_UV_Tangent_Skinning, jointIndexes));
|
||||
s_declarations[VertexLayout_XYZ_Normal_UV_Tangent_Skinning] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Normal,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_TexCoord,
|
||||
ComponentType_Float2,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Tangent,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Userdata,
|
||||
ComponentType_Int1,
|
||||
0 // Weight count
|
||||
},
|
||||
{
|
||||
VertexComponent_Userdata,
|
||||
ComponentType_Float4,
|
||||
1 // Weights
|
||||
},
|
||||
{
|
||||
VertexComponent_Userdata,
|
||||
ComponentType_Int4,
|
||||
2 // Joint indexes
|
||||
},
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ_Normal_UV_Tangent_Skinning), "Invalid stride for declaration VertexLayout_XYZ_Normal_UV_Tangent_Skinning");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ_Normal_UV_Tangent_Skinning]->GetStride() == sizeof(VertexStruct_XYZ_Normal_UV_Tangent_Skinning), "Invalid stride for declaration VertexLayout_XYZ_Normal_UV_Tangent_Skinning");
|
||||
|
||||
// VertexLayout_XYZ_UV : VertexStruct_XYZ_UV
|
||||
declaration = &s_declarations[VertexLayout_XYZ_UV];
|
||||
declaration->EnableComponent(VertexComponent_Position, ComponentType_Float3, NazaraOffsetOf(VertexStruct_XYZ_UV, position));
|
||||
declaration->EnableComponent(VertexComponent_TexCoord, ComponentType_Float2, NazaraOffsetOf(VertexStruct_XYZ_UV, uv));
|
||||
s_declarations[VertexLayout_XYZ_UV] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Position,
|
||||
ComponentType_Float3,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_TexCoord,
|
||||
ComponentType_Float2,
|
||||
0
|
||||
}
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(VertexStruct_XYZ_UV), "Invalid stride for declaration VertexLayout_XYZ_UV");
|
||||
NazaraAssert(s_declarations[VertexLayout_XYZ_UV]->GetStride() == sizeof(VertexStruct_XYZ_UV), "Invalid stride for declaration VertexLayout_XYZ_UV");
|
||||
|
||||
// VertexLayout_Matrix4 : Matrix4f
|
||||
declaration = &s_declarations[VertexLayout_Matrix4];
|
||||
declaration->EnableComponent(VertexComponent_InstanceData0, ComponentType_Float4, NazaraOffsetOf(Matrix4f, m11));
|
||||
declaration->EnableComponent(VertexComponent_InstanceData1, ComponentType_Float4, NazaraOffsetOf(Matrix4f, m21));
|
||||
declaration->EnableComponent(VertexComponent_InstanceData2, ComponentType_Float4, NazaraOffsetOf(Matrix4f, m31));
|
||||
declaration->EnableComponent(VertexComponent_InstanceData3, ComponentType_Float4, NazaraOffsetOf(Matrix4f, m41));
|
||||
s_declarations[VertexLayout_Matrix4] = NewDeclaration(VertexInputRate::Vertex, {
|
||||
{
|
||||
VertexComponent_Userdata,
|
||||
ComponentType_Float4,
|
||||
0
|
||||
},
|
||||
{
|
||||
VertexComponent_Userdata,
|
||||
ComponentType_Float4,
|
||||
1
|
||||
},
|
||||
{
|
||||
VertexComponent_Userdata,
|
||||
ComponentType_Float4,
|
||||
2
|
||||
},
|
||||
{
|
||||
VertexComponent_Userdata,
|
||||
ComponentType_Float4,
|
||||
3
|
||||
}
|
||||
});
|
||||
|
||||
NazaraAssert(declaration->GetStride() == sizeof(Matrix4f), "Invalid stride for declaration VertexLayout_Matrix4");*/
|
||||
NazaraAssert(s_declarations[VertexLayout_Matrix4]->GetStride() == sizeof(Matrix4f), "Invalid stride for declaration VertexLayout_Matrix4");
|
||||
}
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user