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.
11214 Commits
21 Branches
19 Tags
70 MiB
Tree: 9b4d394a14
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9b4d394a14'
${ noResults }
magnum/src/Magnum/Shaders/Test/MeshVisualizerGL_Test.cpp

313 lines
13 KiB
Raw Normal View History Unescape

Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
It's October already?!
2 years ago
2020, 2021, 2022, 2023, 2024
Vladimír Vondruš <mosra@centrum.cz>
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 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.
*/
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
#include <Corrade/Containers/ArrayView.h> /* arraySize() */
#include <Corrade/Containers/String.h>
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#include <Corrade/TestSuite/Tester.h>
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
#include <Corrade/Utility/Format.h>
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#include "Magnum/Shaders/MeshVisualizerGL.h"
namespace Magnum { namespace Shaders { namespace Test { namespace {
/* There's an underscore between GL and Test to disambiguate from GLTest, which
is a common suffix used to mark tests that need a GL context. Ugly, I know. */
struct MeshVisualizerGL_Test: TestSuite::Tester {
explicit MeshVisualizerGL_Test();
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
#ifndef MAGNUM_TARGET_GLES2
void configurationSetJointCountInvalid2D();
void configurationSetJointCountInvalid3D();
#endif
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
void constructNoCreate2D();
void constructNoCreate3D();
void constructCopy2D();
void constructCopy3D();
void vertexIndexSameAsObjectId();
void debugFlag2D();
void debugFlag3D();
void debugFlags2D();
void debugFlags3D();
Shaders: multidraw support in all builtin shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
void debugFlagsSupersets2D();
void debugFlagsSupersets3D();
#endif
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
};
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
#ifndef MAGNUM_TARGET_GLES2
const struct {
const char* name;
UnsignedInt jointCount, perVertexJointCount, secondaryPerVertexJointCount;
const char* message;
} ConfigurationSetJointCountInvalidData[] {
{"per-vertex joint count too large",
10, 5, 0,
"expected at most 4 per-vertex joints, got 5"},
{"secondary per-vertex joint count too large",
10, 0, 5,
"expected at most 4 secondary per-vertex joints, got 5"},
{"joint count but no per-vertex joint count",
10, 0, 0,
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
"count has to be zero if per-vertex joint count is zero"},
/* The rest depends on flags being set and is thus verified in constructor,
tested in MeshVisualizerGLTest::constructInvalid() and
constructUniformBuffersInvalid() */
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
};
#endif
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
MeshVisualizerGL_Test::MeshVisualizerGL_Test() {
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
#ifndef MAGNUM_TARGET_GLES2
addInstancedTests({
&MeshVisualizerGL_Test::configurationSetJointCountInvalid2D,
&MeshVisualizerGL_Test::configurationSetJointCountInvalid3D},
Containers::arraySize(ConfigurationSetJointCountInvalidData));
#endif
Shaders: multidraw support in all builtin shaders.
5 years ago
addTests({
&MeshVisualizerGL_Test::constructNoCreate2D,
&MeshVisualizerGL_Test::constructNoCreate3D,
&MeshVisualizerGL_Test::constructCopy2D,
&MeshVisualizerGL_Test::constructCopy3D,
&MeshVisualizerGL_Test::vertexIndexSameAsObjectId,
&MeshVisualizerGL_Test::debugFlag2D,
&MeshVisualizerGL_Test::debugFlag3D,
&MeshVisualizerGL_Test::debugFlags2D,
&MeshVisualizerGL_Test::debugFlags3D,
#ifndef MAGNUM_TARGET_GLES2
&MeshVisualizerGL_Test::debugFlagsSupersets2D,
&MeshVisualizerGL_Test::debugFlagsSupersets3D,
#endif
});
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
}
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
#ifndef MAGNUM_TARGET_GLES2
void MeshVisualizerGL_Test::configurationSetJointCountInvalid2D() {
auto&& data = ConfigurationSetJointCountInvalidData[testCaseInstanceId()];
setTestCaseDescription(data.name);
CORRADE_SKIP_IF_NO_ASSERT();
MeshVisualizerGL2D::Configuration configuration;
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
Error redirectError{&out};
configuration.setJointCount(data.jointCount, data.perVertexJointCount, data.secondaryPerVertexJointCount);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, Utility::format("Shaders::MeshVisualizerGL2D::Configuration::setJointCount(): {}\n", data.message));
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
}
void MeshVisualizerGL_Test::configurationSetJointCountInvalid3D() {
auto&& data = ConfigurationSetJointCountInvalidData[testCaseInstanceId()];
setTestCaseDescription(data.name);
CORRADE_SKIP_IF_NO_ASSERT();
MeshVisualizerGL3D::Configuration configuration;
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
Error redirectError{&out};
configuration.setJointCount(data.jointCount, data.perVertexJointCount, data.secondaryPerVertexJointCount);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, Utility::format("Shaders::MeshVisualizerGL3D::Configuration::setJointCount(): {}\n", data.message));
Shaders: skinning support in FlatGL, MeshVisualizerGL and PhongGL. High-level docs with examples will be written once there's corresponding support in MeshTools::compile() *and* in importer plugins, as skinned meshes are usually brought in from files, never set up directly. Co-authored-by: Squareys <squareys@googlemail.com>
3 years ago
}
#endif
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
void MeshVisualizerGL_Test::constructNoCreate2D() {
{
MeshVisualizerGL2D shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), MeshVisualizerGL2D::Flags{});
}
CORRADE_VERIFY(true);
}
void MeshVisualizerGL_Test::constructNoCreate3D() {
{
MeshVisualizerGL3D shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), MeshVisualizerGL3D::Flags{});
}
CORRADE_VERIFY(true);
}
void MeshVisualizerGL_Test::constructCopy2D() {
CORRADE_VERIFY(!std::is_copy_constructible<MeshVisualizerGL2D>{});
CORRADE_VERIFY(!std::is_copy_assignable<MeshVisualizerGL2D>{});
}
void MeshVisualizerGL_Test::constructCopy3D() {
CORRADE_VERIFY(!std::is_copy_constructible<MeshVisualizerGL3D>{});
CORRADE_VERIFY(!std::is_copy_assignable<MeshVisualizerGL3D>{});
}
void MeshVisualizerGL_Test::vertexIndexSameAsObjectId() {
#ifdef MAGNUM_TARGET_GLES2
CORRADE_SKIP("Object ID is not available on ES2.");
#else
CORRADE_COMPARE(MeshVisualizerGL2D::VertexIndex::Location, GenericGL2D::ObjectId::Location);
CORRADE_COMPARE(MeshVisualizerGL3D::VertexIndex::Location, GenericGL3D::ObjectId::Location);
#endif
}
void MeshVisualizerGL_Test::debugFlag2D() {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << MeshVisualizerGL2D::Flag::Wireframe << MeshVisualizerGL2D::Flag(0xbad00000);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::Wireframe Shaders::MeshVisualizerGL2D::Flag(0xbad00000)\n");
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
}
void MeshVisualizerGL_Test::debugFlag3D() {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << MeshVisualizerGL3D::Flag::Wireframe << MeshVisualizerGL3D::Flag(0xbad00000);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::Wireframe Shaders::MeshVisualizerGL3D::Flag(0xbad00000)\n");
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
}
void MeshVisualizerGL_Test::debugFlags2D() {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::Wireframe|MeshVisualizerGL2D::Flag::NoGeometryShader) << MeshVisualizerGL2D::Flags{};
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::Wireframe|Shaders::MeshVisualizerGL2D::Flag::NoGeometryShader Shaders::MeshVisualizerGL2D::Flags{}\n");
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#else
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::Wireframe Shaders::MeshVisualizerGL2D::Flags{}\n");
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#endif
}
void MeshVisualizerGL_Test::debugFlags3D() {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::Wireframe|MeshVisualizerGL3D::Flag::NoGeometryShader) << MeshVisualizerGL3D::Flags{};
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::Wireframe|Shaders::MeshVisualizerGL3D::Flag::NoGeometryShader Shaders::MeshVisualizerGL3D::Flags{}\n");
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#else
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::Wireframe Shaders::MeshVisualizerGL3D::Flags{}\n");
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#endif
}
Shaders: multidraw support in all builtin shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
void MeshVisualizerGL_Test::debugFlagsSupersets2D() {
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
/* InstancedObjectId and ObjectIdTexture are a superset of ObjectId so only
one should be printed, but if there are both then both should be */
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::ObjectId|MeshVisualizerGL2D::Flag::InstancedObjectId);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::InstancedObjectId\n");
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
} {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::ObjectId|MeshVisualizerGL2D::Flag::ObjectIdTexture);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::ObjectIdTexture\n");
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
} {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::ObjectId|MeshVisualizerGL2D::Flag::InstancedObjectId|MeshVisualizerGL2D::Flag::ObjectIdTexture);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::InstancedObjectId|Shaders::MeshVisualizerGL2D::Flag::ObjectIdTexture\n");
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
}
Shaders: add all values to MeshVisualizerGL*D::Flags debug printer. Forgot about these for some reason.
3 years ago
/* InstancedTextureOffset is a superset of TextureTransformation so only
one should be printed */
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add all values to MeshVisualizerGL*D::Flags debug printer. Forgot about these for some reason.
3 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::InstancedTextureOffset|MeshVisualizerGL2D::Flag::TextureTransformation);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::InstancedTextureOffset\n");
Shaders: add all values to MeshVisualizerGL*D::Flags debug printer. Forgot about these for some reason.
3 years ago
}
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
/* MultiDraw and ShaderStorageBuffers are a superset of UniformBuffers so
only one should be printed, but if there are both then both should be */
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::MultiDraw|MeshVisualizerGL2D::Flag::UniformBuffers);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::MultiDraw\n");
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
}
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
#ifndef MAGNUM_TARGET_WEBGL
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::ShaderStorageBuffers|MeshVisualizerGL2D::Flag::UniformBuffers);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::ShaderStorageBuffers\n");
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
} {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
Debug{&out} << (MeshVisualizerGL2D::Flag::MultiDraw|MeshVisualizerGL2D::Flag::ShaderStorageBuffers|MeshVisualizerGL2D::Flag::UniformBuffers);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL2D::Flag::MultiDraw|Shaders::MeshVisualizerGL2D::Flag::ShaderStorageBuffers\n");
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
}
#endif
Shaders: multidraw support in all builtin shaders.
5 years ago
}
void MeshVisualizerGL_Test::debugFlagsSupersets3D() {
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
/* InstancedObjectId and ObjectIdTexture are a superset of ObjectId so only
one should be printed, but if there are both then both should be */
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::ObjectId|MeshVisualizerGL3D::Flag::InstancedObjectId);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::InstancedObjectId\n");
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
} {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::ObjectId|MeshVisualizerGL3D::Flag::ObjectIdTexture);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::ObjectIdTexture\n");
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
} {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: implement object ID texture visualization in MeshVisualizer. Hah this took a while, as there was no texture scaffolding in place at all. Thus all this had to be added and tested for the first time: * 2D textures * 2D texture arrays * Texture transformation uniforms * Texture transformation UBOs * Instanced texture offset This also means that MeshVisualizer can be used to visualize arbitrary (single-channel) integer textures now, not just render meshes with object ID textures. Yay for feature parity!
4 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::ObjectId|MeshVisualizerGL3D::Flag::InstancedObjectId|MeshVisualizerGL3D::Flag::ObjectIdTexture);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::InstancedObjectId|Shaders::MeshVisualizerGL3D::Flag::ObjectIdTexture\n");
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
}
Shaders: add all values to MeshVisualizerGL*D::Flags debug printer. Forgot about these for some reason.
3 years ago
/* InstancedTextureOffset is a superset of TextureTransformation so only
one should be printed */
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add all values to MeshVisualizerGL*D::Flags debug printer. Forgot about these for some reason.
3 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::InstancedTextureOffset|MeshVisualizerGL3D::Flag::TextureTransformation);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::InstancedTextureOffset\n");
Shaders: add all values to MeshVisualizerGL*D::Flags debug printer. Forgot about these for some reason.
3 years ago
}
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
/* MultiDraw and ShaderStorageBuffers are a superset of UniformBuffers so
only one should be printed, but if there are both then both should be */
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::MultiDraw|MeshVisualizerGL3D::Flag::UniformBuffers);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::MultiDraw\n");
Shaders: add missing MeshVisualizerGL*D::setObjectId(). Originally the uniform wasn't present with the assumption that users could easily adjust color map offset to achieve the same effect. That was however unnecessarily annoying and error-prone in cases where it's essential to have the same object IDs from multiple draws have a matching color, and it was complicating multidraw workflows as the color map offset was not a part of per-draw data, but rather material data.
4 years ago
}
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
#ifndef MAGNUM_TARGET_WEBGL
{
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::ShaderStorageBuffers|MeshVisualizerGL3D::Flag::UniformBuffers);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::ShaderStorageBuffers\n");
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
} {
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
Containers::String out;
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
Debug{&out} << (MeshVisualizerGL3D::Flag::MultiDraw|MeshVisualizerGL3D::Flag::ShaderStorageBuffers|MeshVisualizerGL3D::Flag::UniformBuffers);
Test: remove all use of <sstream> for Debug output testing. Compared to Corrade, the improvement in compile time is about a minute cumulative across all cores, or about 8 seconds on an 8-core system (~2 minutes before, ~1:52 after). Not bad at all. And this is with a deprecated build, the non-deprecated build is 1:48 -> 1:41.
1 year ago
CORRADE_COMPARE(out, "Shaders::MeshVisualizerGL3D::Flag::MultiDraw|Shaders::MeshVisualizerGL3D::Flag::ShaderStorageBuffers\n");
Shaders: add SSBO support to all shaders. For when there's so much to render that it wouldn't fit into an UBO and splitting draw calls and binding buffers under an offset is unwanted overhead.
3 years ago
}
#endif
Shaders: multidraw support in all builtin shaders.
5 years ago
}
#endif
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
}}}}
CORRADE_TEST_MAIN(Magnum::Shaders::Test::MeshVisualizerGL_Test)