ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
11590 Commits
21 Branches
19 Tags
70 MiB
Tree: b85f0c8dfe
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'b85f0c8dfe'
${ noResults }
magnum/src/Magnum/VertexFormat.cpp

949 lines
38 KiB
Raw Normal View History Unescape

New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
/*
This file is part of Magnum.
Updated copyright year.
6 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
Here we go again.
1 year ago
2020, 2021, 2022, 2023, 2024, 2025
It's October already?!
2 years ago
Vladimír Vondruš <mosra@centrum.cz>
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include "VertexFormat.h"
Use Corrade String[View] in some ConfigurationValue specializations. These headers are included quite often and because <Corrade/Utility/StlForwardString.h> expands to the whole <string>, it has quite a significant impact. Other cases like Math/ConfigurationValue.h are not changed at the moment, as that header is only included together with Utility::Arguments or Utility::Configuration -- and these classes are still STL-heavy, so avoiding std::string usage in just the ConfigurationValue specializations doesn't help anything at the moment.
4 years ago
#include <Corrade/Containers/String.h>
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
#include <Corrade/Containers/ArrayView.h>
#include <Corrade/Utility/Assert.h>
#include <Corrade/Utility/Debug.h>
namespace Magnum {
UnsignedInt vertexFormatSize(const VertexFormat format) {
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"vertexFormatSize(): can't determine size of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
switch(format) {
case VertexFormat::UnsignedByte:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::UnsignedByteNormalized:
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
case VertexFormat::Byte:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::ByteNormalized:
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
return 1;
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::Half:
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
case VertexFormat::UnsignedShort:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::UnsignedShortNormalized:
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
case VertexFormat::Short:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::ShortNormalized:
case VertexFormat::Vector2ub:
case VertexFormat::Vector2ubNormalized:
case VertexFormat::Vector2b:
case VertexFormat::Vector2bNormalized:
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
return 2;
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::Vector3ub:
case VertexFormat::Vector3ubNormalized:
case VertexFormat::Vector3b:
case VertexFormat::Vector3bNormalized:
return 3;
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
case VertexFormat::Float:
case VertexFormat::UnsignedInt:
case VertexFormat::Int:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::Vector2h:
case VertexFormat::Vector2us:
case VertexFormat::Vector2usNormalized:
case VertexFormat::Vector2s:
case VertexFormat::Vector2sNormalized:
case VertexFormat::Vector4ub:
case VertexFormat::Vector4ubNormalized:
case VertexFormat::Vector4b:
case VertexFormat::Vector4bNormalized:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2bNormalized:
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
return 4;
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::Vector3h:
case VertexFormat::Vector3us:
case VertexFormat::Vector3usNormalized:
case VertexFormat::Vector3s:
case VertexFormat::Vector3sNormalized:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x3bNormalized:
case VertexFormat::Matrix3x2bNormalized:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 6;
case VertexFormat::Double:
case VertexFormat::Vector2:
case VertexFormat::Vector2ui:
case VertexFormat::Vector2i:
case VertexFormat::Vector4h:
case VertexFormat::Vector4us:
case VertexFormat::Vector4usNormalized:
case VertexFormat::Vector4s:
case VertexFormat::Vector4sNormalized:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2h:
case VertexFormat::Matrix2x2sNormalized:
case VertexFormat::Matrix2x4bNormalized:
case VertexFormat::Matrix2x2bNormalizedAligned:
case VertexFormat::Matrix2x3bNormalizedAligned:
case VertexFormat::Matrix4x2bNormalized:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 8;
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix3x3bNormalized:
return 9;
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::Vector3:
case VertexFormat::Vector3ui:
case VertexFormat::Vector3i:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x3h:
case VertexFormat::Matrix2x3sNormalized:
case VertexFormat::Matrix3x2h:
case VertexFormat::Matrix3x2sNormalized:
case VertexFormat::Matrix3x4bNormalized:
case VertexFormat::Matrix3x2bNormalizedAligned:
case VertexFormat::Matrix3x3bNormalizedAligned:
case VertexFormat::Matrix4x3bNormalized:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 12;
case VertexFormat::Vector2d:
case VertexFormat::Vector4:
case VertexFormat::Vector4ui:
case VertexFormat::Vector4i:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2:
case VertexFormat::Matrix2x4h:
case VertexFormat::Matrix2x4sNormalized:
case VertexFormat::Matrix2x3hAligned:
case VertexFormat::Matrix2x3sNormalizedAligned:
case VertexFormat::Matrix4x2h:
case VertexFormat::Matrix4x2sNormalized:
case VertexFormat::Matrix4x4bNormalized:
case VertexFormat::Matrix4x2bNormalizedAligned:
case VertexFormat::Matrix4x3bNormalizedAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 16;
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix3x3h:
case VertexFormat::Matrix3x3sNormalized:
return 18;
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
case VertexFormat::Vector3d:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x3:
case VertexFormat::Matrix3x2:
case VertexFormat::Matrix3x4h:
case VertexFormat::Matrix3x4sNormalized:
case VertexFormat::Matrix3x3hAligned:
case VertexFormat::Matrix3x3sNormalizedAligned:
case VertexFormat::Matrix4x3h:
case VertexFormat::Matrix4x3sNormalized:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 24;
case VertexFormat::Vector4d:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2d:
case VertexFormat::Matrix2x4:
case VertexFormat::Matrix4x2:
case VertexFormat::Matrix4x4h:
case VertexFormat::Matrix4x4sNormalized:
case VertexFormat::Matrix4x3hAligned:
case VertexFormat::Matrix4x3sNormalizedAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 32;
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix3x3:
return 36;
case VertexFormat::Matrix2x3d:
case VertexFormat::Matrix3x2d:
case VertexFormat::Matrix3x4:
case VertexFormat::Matrix4x3:
return 48;
case VertexFormat::Matrix2x4d:
case VertexFormat::Matrix4x2d:
case VertexFormat::Matrix4x4:
return 64;
case VertexFormat::Matrix3x3d:
return 72;
case VertexFormat::Matrix3x4d:
case VertexFormat::Matrix4x3d:
return 96;
case VertexFormat::Matrix4x4d:
return 128;
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
}
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
CORRADE_ASSERT_UNREACHABLE("vertexFormatSize(): invalid format" << format, {});
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
}
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
UnsignedInt vertexFormatComponentCount(const VertexFormat format) {
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"vertexFormatComponentCount(): can't determine component count of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
switch(format) {
case VertexFormat::Float:
case VertexFormat::Half:
case VertexFormat::Double:
case VertexFormat::UnsignedByte:
case VertexFormat::UnsignedByteNormalized:
case VertexFormat::Byte:
case VertexFormat::ByteNormalized:
case VertexFormat::UnsignedShort:
case VertexFormat::UnsignedShortNormalized:
case VertexFormat::Short:
case VertexFormat::ShortNormalized:
case VertexFormat::UnsignedInt:
case VertexFormat::Int:
return 1;
case VertexFormat::Vector2:
case VertexFormat::Vector2h:
case VertexFormat::Vector2d:
case VertexFormat::Vector2ub:
case VertexFormat::Vector2ubNormalized:
case VertexFormat::Vector2b:
case VertexFormat::Vector2bNormalized:
case VertexFormat::Vector2us:
case VertexFormat::Vector2usNormalized:
case VertexFormat::Vector2s:
case VertexFormat::Vector2sNormalized:
case VertexFormat::Vector2ui:
case VertexFormat::Vector2i:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2:
case VertexFormat::Matrix2x2h:
case VertexFormat::Matrix2x2d:
case VertexFormat::Matrix2x2bNormalized:
case VertexFormat::Matrix2x2sNormalized:
case VertexFormat::Matrix2x2bNormalizedAligned:
case VertexFormat::Matrix3x2:
case VertexFormat::Matrix3x2h:
case VertexFormat::Matrix3x2d:
case VertexFormat::Matrix3x2bNormalized:
case VertexFormat::Matrix3x2sNormalized:
case VertexFormat::Matrix3x2bNormalizedAligned:
case VertexFormat::Matrix4x2:
case VertexFormat::Matrix4x2h:
case VertexFormat::Matrix4x2d:
case VertexFormat::Matrix4x2bNormalized:
case VertexFormat::Matrix4x2sNormalized:
case VertexFormat::Matrix4x2bNormalizedAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 2;
case VertexFormat::Vector3:
case VertexFormat::Vector3h:
case VertexFormat::Vector3d:
case VertexFormat::Vector3ub:
case VertexFormat::Vector3ubNormalized:
case VertexFormat::Vector3b:
case VertexFormat::Vector3bNormalized:
case VertexFormat::Vector3us:
case VertexFormat::Vector3usNormalized:
case VertexFormat::Vector3s:
case VertexFormat::Vector3sNormalized:
case VertexFormat::Vector3ui:
case VertexFormat::Vector3i:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x3:
case VertexFormat::Matrix2x3h:
case VertexFormat::Matrix2x3d:
case VertexFormat::Matrix2x3bNormalized:
case VertexFormat::Matrix2x3sNormalized:
case VertexFormat::Matrix2x3bNormalizedAligned:
case VertexFormat::Matrix2x3hAligned:
case VertexFormat::Matrix2x3sNormalizedAligned:
case VertexFormat::Matrix3x3:
case VertexFormat::Matrix3x3h:
case VertexFormat::Matrix3x3d:
case VertexFormat::Matrix3x3bNormalized:
case VertexFormat::Matrix3x3sNormalized:
case VertexFormat::Matrix3x3bNormalizedAligned:
case VertexFormat::Matrix3x3hAligned:
case VertexFormat::Matrix3x3sNormalizedAligned:
case VertexFormat::Matrix4x3:
case VertexFormat::Matrix4x3h:
case VertexFormat::Matrix4x3d:
case VertexFormat::Matrix4x3bNormalized:
case VertexFormat::Matrix4x3sNormalized:
case VertexFormat::Matrix4x3bNormalizedAligned:
case VertexFormat::Matrix4x3hAligned:
case VertexFormat::Matrix4x3sNormalizedAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 3;
case VertexFormat::Vector4:
case VertexFormat::Vector4h:
case VertexFormat::Vector4d:
case VertexFormat::Vector4ub:
case VertexFormat::Vector4ubNormalized:
case VertexFormat::Vector4b:
case VertexFormat::Vector4bNormalized:
case VertexFormat::Vector4us:
case VertexFormat::Vector4usNormalized:
case VertexFormat::Vector4s:
case VertexFormat::Vector4sNormalized:
case VertexFormat::Vector4ui:
case VertexFormat::Vector4i:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x4:
case VertexFormat::Matrix2x4h:
case VertexFormat::Matrix2x4d:
case VertexFormat::Matrix2x4bNormalized:
case VertexFormat::Matrix2x4sNormalized:
case VertexFormat::Matrix3x4:
case VertexFormat::Matrix3x4h:
case VertexFormat::Matrix3x4d:
case VertexFormat::Matrix3x4bNormalized:
case VertexFormat::Matrix3x4sNormalized:
case VertexFormat::Matrix4x4:
case VertexFormat::Matrix4x4h:
case VertexFormat::Matrix4x4d:
case VertexFormat::Matrix4x4bNormalized:
case VertexFormat::Matrix4x4sNormalized:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return 4;
}
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
CORRADE_ASSERT_UNREACHABLE("vertexFormatComponentCount(): invalid format" << format, {});
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
}
VertexFormat vertexFormatComponentFormat(const VertexFormat format) {
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"vertexFormatComponentFormat(): can't determine component format of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
switch(format) {
case VertexFormat::Float:
case VertexFormat::Vector2:
case VertexFormat::Vector3:
case VertexFormat::Vector4:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2:
case VertexFormat::Matrix2x3:
case VertexFormat::Matrix2x4:
case VertexFormat::Matrix3x2:
case VertexFormat::Matrix3x3:
case VertexFormat::Matrix3x4:
case VertexFormat::Matrix4x2:
case VertexFormat::Matrix4x3:
case VertexFormat::Matrix4x4:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return VertexFormat::Float;
case VertexFormat::Half:
case VertexFormat::Vector2h:
case VertexFormat::Vector3h:
case VertexFormat::Vector4h:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2h:
case VertexFormat::Matrix2x3h:
case VertexFormat::Matrix2x4h:
case VertexFormat::Matrix2x3hAligned:
case VertexFormat::Matrix3x2h:
case VertexFormat::Matrix3x3h:
case VertexFormat::Matrix3x4h:
case VertexFormat::Matrix3x3hAligned:
case VertexFormat::Matrix4x2h:
case VertexFormat::Matrix4x3h:
case VertexFormat::Matrix4x4h:
case VertexFormat::Matrix4x3hAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return VertexFormat::Half;
case VertexFormat::Double:
case VertexFormat::Vector2d:
case VertexFormat::Vector3d:
case VertexFormat::Vector4d:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2d:
case VertexFormat::Matrix2x3d:
case VertexFormat::Matrix2x4d:
case VertexFormat::Matrix3x2d:
case VertexFormat::Matrix3x3d:
case VertexFormat::Matrix3x4d:
case VertexFormat::Matrix4x2d:
case VertexFormat::Matrix4x3d:
case VertexFormat::Matrix4x4d:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return VertexFormat::Double;
case VertexFormat::UnsignedByte:
case VertexFormat::UnsignedByteNormalized:
case VertexFormat::Vector2ub:
case VertexFormat::Vector2ubNormalized:
case VertexFormat::Vector3ub:
case VertexFormat::Vector3ubNormalized:
case VertexFormat::Vector4ub:
case VertexFormat::Vector4ubNormalized:
return VertexFormat::UnsignedByte;
case VertexFormat::Byte:
case VertexFormat::ByteNormalized:
case VertexFormat::Vector2b:
case VertexFormat::Vector2bNormalized:
case VertexFormat::Vector3b:
case VertexFormat::Vector3bNormalized:
case VertexFormat::Vector4b:
case VertexFormat::Vector4bNormalized:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2bNormalized:
case VertexFormat::Matrix2x3bNormalized:
case VertexFormat::Matrix2x4bNormalized:
case VertexFormat::Matrix2x2bNormalizedAligned:
case VertexFormat::Matrix2x3bNormalizedAligned:
case VertexFormat::Matrix3x2bNormalized:
case VertexFormat::Matrix3x3bNormalized:
case VertexFormat::Matrix3x4bNormalized:
case VertexFormat::Matrix3x2bNormalizedAligned:
case VertexFormat::Matrix3x3bNormalizedAligned:
case VertexFormat::Matrix4x2bNormalized:
case VertexFormat::Matrix4x3bNormalized:
case VertexFormat::Matrix4x4bNormalized:
case VertexFormat::Matrix4x2bNormalizedAligned:
case VertexFormat::Matrix4x3bNormalizedAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return VertexFormat::Byte;
case VertexFormat::UnsignedShort:
case VertexFormat::UnsignedShortNormalized:
case VertexFormat::Vector2us:
case VertexFormat::Vector2usNormalized:
case VertexFormat::Vector3us:
case VertexFormat::Vector3usNormalized:
case VertexFormat::Vector4us:
case VertexFormat::Vector4usNormalized:
return VertexFormat::UnsignedShort;
case VertexFormat::Short:
case VertexFormat::ShortNormalized:
case VertexFormat::Vector2s:
case VertexFormat::Vector2sNormalized:
case VertexFormat::Vector3s:
case VertexFormat::Vector3sNormalized:
case VertexFormat::Vector4s:
case VertexFormat::Vector4sNormalized:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2sNormalized:
case VertexFormat::Matrix2x3sNormalized:
case VertexFormat::Matrix2x4sNormalized:
case VertexFormat::Matrix2x3sNormalizedAligned:
case VertexFormat::Matrix3x2sNormalized:
case VertexFormat::Matrix3x3sNormalized:
case VertexFormat::Matrix3x4sNormalized:
case VertexFormat::Matrix3x3sNormalizedAligned:
case VertexFormat::Matrix4x2sNormalized:
case VertexFormat::Matrix4x3sNormalized:
case VertexFormat::Matrix4x4sNormalized:
case VertexFormat::Matrix4x3sNormalizedAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return VertexFormat::Short;
case VertexFormat::UnsignedInt:
case VertexFormat::Vector2ui:
case VertexFormat::Vector3ui:
case VertexFormat::Vector4ui:
return VertexFormat::UnsignedInt;
case VertexFormat::Int:
case VertexFormat::Vector2i:
case VertexFormat::Vector3i:
case VertexFormat::Vector4i:
return VertexFormat::Int;
}
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
CORRADE_ASSERT_UNREACHABLE("vertexFormatComponentType(): invalid format" << format, {});
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
}
Add matrix vertex formats.
6 years ago
UnsignedInt vertexFormatVectorCount(const VertexFormat format) {
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"vertexFormatVectorCount(): can't determine vector count of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Add matrix vertex formats.
6 years ago
switch(format) {
case VertexFormat::Float:
case VertexFormat::Half:
case VertexFormat::Double:
case VertexFormat::UnsignedByte:
case VertexFormat::UnsignedByteNormalized:
case VertexFormat::Byte:
case VertexFormat::ByteNormalized:
case VertexFormat::UnsignedShort:
case VertexFormat::UnsignedShortNormalized:
case VertexFormat::Short:
case VertexFormat::ShortNormalized:
case VertexFormat::UnsignedInt:
case VertexFormat::Int:
case VertexFormat::Vector2:
case VertexFormat::Vector2h:
case VertexFormat::Vector2d:
case VertexFormat::Vector2ub:
case VertexFormat::Vector2ubNormalized:
case VertexFormat::Vector2b:
case VertexFormat::Vector2bNormalized:
case VertexFormat::Vector2us:
case VertexFormat::Vector2usNormalized:
case VertexFormat::Vector2s:
case VertexFormat::Vector2sNormalized:
case VertexFormat::Vector2ui:
case VertexFormat::Vector2i:
case VertexFormat::Vector3:
case VertexFormat::Vector3h:
case VertexFormat::Vector3d:
case VertexFormat::Vector3ub:
case VertexFormat::Vector3ubNormalized:
case VertexFormat::Vector3b:
case VertexFormat::Vector3bNormalized:
case VertexFormat::Vector3us:
case VertexFormat::Vector3usNormalized:
case VertexFormat::Vector3s:
case VertexFormat::Vector3sNormalized:
case VertexFormat::Vector3ui:
case VertexFormat::Vector3i:
case VertexFormat::Vector4:
case VertexFormat::Vector4h:
case VertexFormat::Vector4d:
case VertexFormat::Vector4ub:
case VertexFormat::Vector4ubNormalized:
case VertexFormat::Vector4b:
case VertexFormat::Vector4bNormalized:
case VertexFormat::Vector4us:
case VertexFormat::Vector4usNormalized:
case VertexFormat::Vector4s:
case VertexFormat::Vector4sNormalized:
case VertexFormat::Vector4ui:
case VertexFormat::Vector4i:
return 1;
case VertexFormat::Matrix2x2:
case VertexFormat::Matrix2x2h:
case VertexFormat::Matrix2x2d:
case VertexFormat::Matrix2x2bNormalized:
case VertexFormat::Matrix2x2sNormalized:
case VertexFormat::Matrix2x2bNormalizedAligned:
case VertexFormat::Matrix2x3:
case VertexFormat::Matrix2x3h:
case VertexFormat::Matrix2x3d:
case VertexFormat::Matrix2x3bNormalized:
case VertexFormat::Matrix2x3sNormalized:
case VertexFormat::Matrix2x3bNormalizedAligned:
case VertexFormat::Matrix2x3hAligned:
case VertexFormat::Matrix2x3sNormalizedAligned:
case VertexFormat::Matrix2x4:
case VertexFormat::Matrix2x4h:
case VertexFormat::Matrix2x4d:
case VertexFormat::Matrix2x4bNormalized:
case VertexFormat::Matrix2x4sNormalized:
return 2;
case VertexFormat::Matrix3x2:
case VertexFormat::Matrix3x2h:
case VertexFormat::Matrix3x2d:
case VertexFormat::Matrix3x2bNormalized:
case VertexFormat::Matrix3x2sNormalized:
case VertexFormat::Matrix3x2bNormalizedAligned:
case VertexFormat::Matrix3x3:
case VertexFormat::Matrix3x3h:
case VertexFormat::Matrix3x3d:
case VertexFormat::Matrix3x3bNormalized:
case VertexFormat::Matrix3x3sNormalized:
case VertexFormat::Matrix3x3bNormalizedAligned:
case VertexFormat::Matrix3x3hAligned:
case VertexFormat::Matrix3x3sNormalizedAligned:
case VertexFormat::Matrix3x4:
case VertexFormat::Matrix3x4h:
case VertexFormat::Matrix3x4d:
case VertexFormat::Matrix3x4bNormalized:
case VertexFormat::Matrix3x4sNormalized:
return 3;
case VertexFormat::Matrix4x2:
case VertexFormat::Matrix4x2h:
case VertexFormat::Matrix4x2d:
case VertexFormat::Matrix4x2bNormalized:
case VertexFormat::Matrix4x2sNormalized:
case VertexFormat::Matrix4x2bNormalizedAligned:
case VertexFormat::Matrix4x3:
case VertexFormat::Matrix4x3h:
case VertexFormat::Matrix4x3d:
case VertexFormat::Matrix4x3bNormalized:
case VertexFormat::Matrix4x3sNormalized:
case VertexFormat::Matrix4x3bNormalizedAligned:
case VertexFormat::Matrix4x3hAligned:
case VertexFormat::Matrix4x3sNormalizedAligned:
case VertexFormat::Matrix4x4:
case VertexFormat::Matrix4x4h:
case VertexFormat::Matrix4x4d:
case VertexFormat::Matrix4x4bNormalized:
case VertexFormat::Matrix4x4sNormalized:
return 4;
}
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
CORRADE_ASSERT_UNREACHABLE("vertexFormatVectorCount(): invalid format" << format, {});
Add matrix vertex formats.
6 years ago
}
UnsignedInt vertexFormatVectorStride(const VertexFormat format) {
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"vertexFormatVectorStride(): can't determine vector count of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Add matrix vertex formats.
6 years ago
switch(format) {
case VertexFormat::UnsignedByte:
case VertexFormat::UnsignedByteNormalized:
case VertexFormat::Byte:
case VertexFormat::ByteNormalized:
return 1;
case VertexFormat::Half:
case VertexFormat::UnsignedShort:
case VertexFormat::UnsignedShortNormalized:
case VertexFormat::Short:
case VertexFormat::ShortNormalized:
case VertexFormat::Vector2ub:
case VertexFormat::Vector2ubNormalized:
case VertexFormat::Vector2b:
case VertexFormat::Vector2bNormalized:
case VertexFormat::Matrix2x2bNormalized:
case VertexFormat::Matrix3x2bNormalized:
case VertexFormat::Matrix4x2bNormalized:
return 2;
case VertexFormat::Vector3ub:
case VertexFormat::Vector3ubNormalized:
case VertexFormat::Vector3b:
case VertexFormat::Vector3bNormalized:
case VertexFormat::Matrix2x3bNormalized:
case VertexFormat::Matrix3x3bNormalized:
case VertexFormat::Matrix4x3bNormalized:
return 3;
case VertexFormat::Float:
case VertexFormat::UnsignedInt:
case VertexFormat::Int:
case VertexFormat::Vector2h:
case VertexFormat::Vector2us:
case VertexFormat::Vector2usNormalized:
case VertexFormat::Vector2s:
case VertexFormat::Vector2sNormalized:
case VertexFormat::Vector4ub:
case VertexFormat::Vector4ubNormalized:
case VertexFormat::Vector4b:
case VertexFormat::Vector4bNormalized:
case VertexFormat::Matrix2x2bNormalizedAligned:
case VertexFormat::Matrix3x2bNormalizedAligned:
case VertexFormat::Matrix4x2bNormalizedAligned:
case VertexFormat::Matrix2x3bNormalizedAligned:
case VertexFormat::Matrix3x3bNormalizedAligned:
case VertexFormat::Matrix4x3bNormalizedAligned:
case VertexFormat::Matrix2x4bNormalized:
case VertexFormat::Matrix3x4bNormalized:
case VertexFormat::Matrix4x4bNormalized:
case VertexFormat::Matrix2x2h:
case VertexFormat::Matrix3x2h:
case VertexFormat::Matrix4x2h:
case VertexFormat::Matrix2x2sNormalized:
case VertexFormat::Matrix3x2sNormalized:
case VertexFormat::Matrix4x2sNormalized:
return 4;
case VertexFormat::Vector3h:
case VertexFormat::Vector3us:
case VertexFormat::Vector3usNormalized:
case VertexFormat::Vector3s:
case VertexFormat::Vector3sNormalized:
case VertexFormat::Matrix2x3h:
case VertexFormat::Matrix3x3h:
case VertexFormat::Matrix4x3h:
case VertexFormat::Matrix2x3sNormalized:
case VertexFormat::Matrix3x3sNormalized:
case VertexFormat::Matrix4x3sNormalized:
return 6;
case VertexFormat::Double:
case VertexFormat::Vector2:
case VertexFormat::Vector2ui:
case VertexFormat::Vector2i:
case VertexFormat::Vector4h:
case VertexFormat::Vector4us:
case VertexFormat::Vector4usNormalized:
case VertexFormat::Vector4s:
case VertexFormat::Vector4sNormalized:
case VertexFormat::Matrix2x2:
case VertexFormat::Matrix3x2:
case VertexFormat::Matrix4x2:
case VertexFormat::Matrix2x4h:
case VertexFormat::Matrix3x4h:
case VertexFormat::Matrix4x4h:
case VertexFormat::Matrix2x4sNormalized:
case VertexFormat::Matrix3x4sNormalized:
case VertexFormat::Matrix4x4sNormalized:
case VertexFormat::Matrix2x3hAligned:
case VertexFormat::Matrix3x3hAligned:
case VertexFormat::Matrix4x3hAligned:
case VertexFormat::Matrix2x3sNormalizedAligned:
case VertexFormat::Matrix3x3sNormalizedAligned:
case VertexFormat::Matrix4x3sNormalizedAligned:
return 8;
case VertexFormat::Vector3:
case VertexFormat::Vector3ui:
case VertexFormat::Vector3i:
case VertexFormat::Matrix2x3:
case VertexFormat::Matrix3x3:
case VertexFormat::Matrix4x3:
return 12;
case VertexFormat::Vector2d:
case VertexFormat::Vector4:
case VertexFormat::Vector4ui:
case VertexFormat::Vector4i:
case VertexFormat::Matrix2x4:
case VertexFormat::Matrix3x4:
case VertexFormat::Matrix4x4:
case VertexFormat::Matrix2x2d:
case VertexFormat::Matrix3x2d:
case VertexFormat::Matrix4x2d:
return 16;
case VertexFormat::Vector3d:
case VertexFormat::Matrix2x3d:
case VertexFormat::Matrix3x3d:
case VertexFormat::Matrix4x3d:
return 24;
case VertexFormat::Vector4d:
case VertexFormat::Matrix2x4d:
case VertexFormat::Matrix3x4d:
case VertexFormat::Matrix4x4d:
return 32;
}
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
CORRADE_ASSERT_UNREACHABLE("vertexFormatVectorStride(): invalid format" << format, {});
Add matrix vertex formats.
6 years ago
}
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
bool isVertexFormatNormalized(const VertexFormat format) {
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"isVertexFormatNormalized(): can't determine normalization of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
switch(format) {
case VertexFormat::Float:
case VertexFormat::Half:
case VertexFormat::Double:
case VertexFormat::UnsignedByte:
case VertexFormat::Byte:
case VertexFormat::UnsignedShort:
case VertexFormat::Short:
case VertexFormat::UnsignedInt:
case VertexFormat::Int:
case VertexFormat::Vector2:
case VertexFormat::Vector2h:
case VertexFormat::Vector2d:
case VertexFormat::Vector2ub:
case VertexFormat::Vector2b:
case VertexFormat::Vector2us:
case VertexFormat::Vector2s:
case VertexFormat::Vector2ui:
case VertexFormat::Vector2i:
case VertexFormat::Vector3:
case VertexFormat::Vector3h:
case VertexFormat::Vector3d:
case VertexFormat::Vector3ub:
case VertexFormat::Vector3b:
case VertexFormat::Vector3us:
case VertexFormat::Vector3s:
case VertexFormat::Vector3ui:
case VertexFormat::Vector3i:
case VertexFormat::Vector4:
case VertexFormat::Vector4h:
case VertexFormat::Vector4d:
case VertexFormat::Vector4ub:
case VertexFormat::Vector4b:
case VertexFormat::Vector4us:
case VertexFormat::Vector4s:
case VertexFormat::Vector4ui:
case VertexFormat::Vector4i:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2:
case VertexFormat::Matrix2x2h:
case VertexFormat::Matrix2x2d:
case VertexFormat::Matrix2x3:
case VertexFormat::Matrix2x3h:
case VertexFormat::Matrix2x3d:
case VertexFormat::Matrix2x4:
case VertexFormat::Matrix2x4h:
case VertexFormat::Matrix2x4d:
case VertexFormat::Matrix2x3hAligned:
case VertexFormat::Matrix3x2:
case VertexFormat::Matrix3x2h:
case VertexFormat::Matrix3x2d:
case VertexFormat::Matrix3x3:
case VertexFormat::Matrix3x3h:
case VertexFormat::Matrix3x3d:
case VertexFormat::Matrix3x4:
case VertexFormat::Matrix3x4h:
case VertexFormat::Matrix3x4d:
case VertexFormat::Matrix3x3hAligned:
case VertexFormat::Matrix4x2:
case VertexFormat::Matrix4x2h:
case VertexFormat::Matrix4x2d:
case VertexFormat::Matrix4x3:
case VertexFormat::Matrix4x3h:
case VertexFormat::Matrix4x3d:
case VertexFormat::Matrix4x4:
case VertexFormat::Matrix4x4h:
case VertexFormat::Matrix4x4d:
case VertexFormat::Matrix4x3hAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return false;
case VertexFormat::UnsignedByteNormalized:
case VertexFormat::ByteNormalized:
case VertexFormat::UnsignedShortNormalized:
case VertexFormat::ShortNormalized:
case VertexFormat::Vector2ubNormalized:
case VertexFormat::Vector2bNormalized:
case VertexFormat::Vector2usNormalized:
case VertexFormat::Vector2sNormalized:
case VertexFormat::Vector3ubNormalized:
case VertexFormat::Vector3bNormalized:
case VertexFormat::Vector3usNormalized:
case VertexFormat::Vector3sNormalized:
case VertexFormat::Vector4ubNormalized:
case VertexFormat::Vector4bNormalized:
case VertexFormat::Vector4usNormalized:
case VertexFormat::Vector4sNormalized:
Add matrix vertex formats.
6 years ago
case VertexFormat::Matrix2x2bNormalized:
case VertexFormat::Matrix2x2sNormalized:
case VertexFormat::Matrix2x3bNormalized:
case VertexFormat::Matrix2x3sNormalized:
case VertexFormat::Matrix2x4bNormalized:
case VertexFormat::Matrix2x4sNormalized:
case VertexFormat::Matrix2x2bNormalizedAligned:
case VertexFormat::Matrix2x3bNormalizedAligned:
case VertexFormat::Matrix2x3sNormalizedAligned:
case VertexFormat::Matrix3x2bNormalized:
case VertexFormat::Matrix3x2sNormalized:
case VertexFormat::Matrix3x3bNormalized:
case VertexFormat::Matrix3x3sNormalized:
case VertexFormat::Matrix3x4bNormalized:
case VertexFormat::Matrix3x4sNormalized:
case VertexFormat::Matrix3x2bNormalizedAligned:
case VertexFormat::Matrix3x3bNormalizedAligned:
case VertexFormat::Matrix3x3sNormalizedAligned:
case VertexFormat::Matrix4x2bNormalized:
case VertexFormat::Matrix4x2sNormalized:
case VertexFormat::Matrix4x3bNormalized:
case VertexFormat::Matrix4x3sNormalized:
case VertexFormat::Matrix4x4bNormalized:
case VertexFormat::Matrix4x4sNormalized:
case VertexFormat::Matrix4x2bNormalizedAligned:
case VertexFormat::Matrix4x3bNormalizedAligned:
case VertexFormat::Matrix4x3sNormalizedAligned:
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
return true;
}
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
CORRADE_ASSERT_UNREACHABLE("isVertexFormatNormalized(): invalid format" << format, {});
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
}
Minor cleanup.
6 years ago
VertexFormat vertexFormat(const VertexFormat format, const UnsignedInt componentCount, const bool normalized) {
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"vertexFormat(): can't assemble a format out of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
VertexFormat componentFormat = vertexFormatComponentFormat(format);
/* First turn the format into a normalized one, if requested */
if(normalized) {
switch(componentFormat) {
case VertexFormat::UnsignedByte:
componentFormat = VertexFormat::UnsignedByteNormalized;
break;
case VertexFormat::Byte:
componentFormat = VertexFormat::ByteNormalized;
break;
case VertexFormat::UnsignedShort:
componentFormat = VertexFormat::UnsignedShortNormalized;
break;
case VertexFormat::Short:
componentFormat = VertexFormat::ShortNormalized;
break;
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
default: CORRADE_ASSERT_UNREACHABLE("vertexFormat():" << format << "can't be made normalized", {});
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
}
}
/* Then turn them into desired component count, assuming the initial order
is the same in all cases */
if(componentCount == 1)
return componentFormat;
else if(componentCount == 2)
return VertexFormat(UnsignedInt(VertexFormat::Vector2) +
UnsignedInt(componentFormat) - UnsignedInt(VertexFormat::Float));
else if(componentCount == 3)
return VertexFormat(UnsignedInt(VertexFormat::Vector3) +
UnsignedInt(componentFormat) - UnsignedInt(VertexFormat::Float));
else if(componentCount == 4)
return VertexFormat(UnsignedInt(VertexFormat::Vector4) +
UnsignedInt(componentFormat) - UnsignedInt(VertexFormat::Float));
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
else CORRADE_ASSERT_UNREACHABLE("vertexFormat(): invalid component count" << componentCount, {});
Add packed, half and double types to VertexFormat. Intentionally not enabling / documenting the double types for use with positions / normals / ... yet. Might come later (or never).
6 years ago
}
Add matrix vertex formats.
6 years ago
VertexFormat vertexFormat(const VertexFormat format, const UnsignedInt vectorCount, UnsignedInt componentCount, const bool aligned) {
CORRADE_ASSERT(!isVertexFormatImplementationSpecific(format),
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
"vertexFormat(): can't assemble a format out of an implementation-specific format" << Debug::hex << vertexFormatUnwrap(format), {});
Add matrix vertex formats.
6 years ago
CORRADE_ASSERT(vectorCount >= 2 && vectorCount <= 4,
"vertexFormat(): invalid vector count" << vectorCount, {});
CORRADE_ASSERT(componentCount >= 2 && componentCount <= 4,
"vertexFormat(): invalid component count" << componentCount, {});
const VertexFormat componentFormat = vertexFormatComponentFormat(format);
const UnsignedInt vectorDistance = (vectorCount - 2)*(
UnsignedInt(VertexFormat::Matrix3x2) -
UnsignedInt(VertexFormat::Matrix2x2));
const UnsignedInt componentDistance = (componentCount - 2)*(
UnsignedInt(VertexFormat::Matrix2x3) -
UnsignedInt(VertexFormat::Matrix2x2));
UnsignedInt out;
switch(componentFormat) {
case VertexFormat::Float:
out = UnsignedInt(VertexFormat::Matrix2x2) + componentDistance;
break;
case VertexFormat::Half:
if(aligned && componentCount == 3)
out = UnsignedInt(VertexFormat::Matrix2x3hAligned);
else
out = UnsignedInt(VertexFormat::Matrix2x2h) + componentDistance;
break;
case VertexFormat::Double:
out = UnsignedInt(VertexFormat::Matrix2x2d) + componentDistance;
break;
case VertexFormat::Byte:
if(aligned && componentCount == 2)
out = UnsignedInt(VertexFormat::Matrix2x2bNormalizedAligned);
else if(aligned && componentCount == 3)
out = UnsignedInt(VertexFormat::Matrix2x3bNormalizedAligned);
else
out = UnsignedInt(VertexFormat::Matrix2x2bNormalized) + componentDistance;
break;
case VertexFormat::Short:
if(aligned && componentCount == 3)
out = UnsignedInt(VertexFormat::Matrix2x3sNormalizedAligned);
else
out = UnsignedInt(VertexFormat::Matrix2x2sNormalized) + componentDistance;
break;
Make this compile and test cleanly with CORRADE_NO_ASSERT defined.
6 years ago
default: CORRADE_ASSERT_UNREACHABLE("vertexFormat(): invalid matrix component type" << componentFormat << Debug::nospace << ", only floating-point or 8-/16-bit signed integer types are supported", {});
Add matrix vertex formats.
6 years ago
}
return VertexFormat(out + vectorDistance);
}
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
namespace {
constexpr const char* VertexFormatNames[] {
#define _c(format) #format,
#include "Magnum/Implementation/vertexFormatMapping.hpp"
#undef _c
};
}
Debug& operator<<(Debug& debug, const VertexFormat value) {
Packed debug output for enums used by Trade. Again not publicly documented because I don't like the naming and I don't have the full behavior and interactions figured out yet -- i.e., an array of VertexFormats would be printed with Debug::packed as a long string of characters without any whitespace. Not good, thus this feature probably needs to be split in two, with this being named "compact" or something else.
4 years ago
const bool packed = debug.immediateFlags() >= Debug::Flag::Packed;
if(!packed)
debug << "VertexFormat" << Debug::nospace;
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
if(isVertexFormatImplementationSpecific(value)) {
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
return debug << (packed ? "ImplementationSpecific(" : "::ImplementationSpecific(") << Debug::nospace << Debug::hex << vertexFormatUnwrap(value) << Debug::nospace << ")";
Enable embedding implementation-specific values in VertexFormat. Similarly to PixelFormat. Will be useful for Vulkan, unfortunately not so much for GL because there the format is specified by three orthogonal values and it's a terrible mess.
6 years ago
}
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
if(UnsignedInt(value) - 1 < Containers::arraySize(VertexFormatNames)) {
Packed debug output for enums used by Trade. Again not publicly documented because I don't like the naming and I don't have the full behavior and interactions figured out yet -- i.e., an array of VertexFormats would be printed with Debug::packed as a long string of characters without any whitespace. Not good, thus this feature probably needs to be split in two, with this being named "compact" or something else.
4 years ago
return debug << (packed ? "" : "::") << Debug::nospace << VertexFormatNames[UnsignedInt(value) - 1];
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
}
Use the new Debug::hex instead of reinterpret_cast<void*>(). This finally fixes most of those annoying MSVC C4312 warnings about conversion to a type of a greater size.
2 years ago
return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedInt(value) << Debug::nospace << (packed ? "" : ")");
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
}
}
namespace Corrade { namespace Utility {
Use Corrade String[View] in some ConfigurationValue specializations. These headers are included quite often and because <Corrade/Utility/StlForwardString.h> expands to the whole <string>, it has quite a significant impact. Other cases like Math/ConfigurationValue.h are not changed at the moment, as that header is only included together with Utility::Arguments or Utility::Configuration -- and these classes are still STL-heavy, so avoiding std::string usage in just the ConfigurationValue specializations doesn't help anything at the moment.
4 years ago
Containers::String ConfigurationValue<Magnum::VertexFormat>::toString(Magnum::VertexFormat value, ConfigurationValueFlags) {
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
if(Magnum::UnsignedInt(value) - 1 < Containers::arraySize(Magnum::VertexFormatNames))
return Magnum::VertexFormatNames[Magnum::UnsignedInt(value) - 1];
return {};
}
Use Corrade String[View] in some ConfigurationValue specializations. These headers are included quite often and because <Corrade/Utility/StlForwardString.h> expands to the whole <string>, it has quite a significant impact. Other cases like Math/ConfigurationValue.h are not changed at the moment, as that header is only included together with Utility::Arguments or Utility::Configuration -- and these classes are still STL-heavy, so avoiding std::string usage in just the ConfigurationValue specializations doesn't help anything at the moment.
4 years ago
Magnum::VertexFormat ConfigurationValue<Magnum::VertexFormat>::fromString(Containers::StringView stringValue, ConfigurationValueFlags) {
New VertexFormat enum. This deliberately doesn't follow the PixelFormat enum naming, as RGBA components make no sense for most vertex data. Checking Metal and WebGPU, they seem to have arrived at a similar conclusion, only VkFormat is an outlier.
7 years ago
for(std::size_t i = 0; i != Containers::arraySize(Magnum::VertexFormatNames); ++i)
if(stringValue == Magnum::VertexFormatNames[i]) return Magnum::VertexFormat(i + 1);
return {};
}
}}