mirror of https://github.com/mosra/magnum.git
Browse Source
All the tests were updated to explicitly check that non-null-terminated strings get handled properly (the GL label APIs have an explicit size, so it *should*, but just in case). Also, because various subclasses override the setter to return correct type for method chaining and the override has to be deinlined to avoid relying on a StringView include, the tests are now explicitly done for each leaf class, instead of the subclass The <string> being removed from the base class for all GL objects may affect downstream projects which relied on it being included. In case of Magnum, the breakages were already fixed in the previous commit. Compile time improvement for the MagnumGL library alone is 0.2 second or 4% (6.1 seconds before, 5.9 after). Not bad, given that there's three more files to compile and strings are still heavily used in other GL debug output APIs and all shader stuff. For a build of just the GL library and all tests, it goes down from 28.9 seconds to 28.1. Most tests also still rely quite heavily on std::stringstream for debug output testing, so the numbers still could go further.pull/240/merge
Vladimír Vondruš
5 years ago
68 changed files with 1046 additions and 385 deletions
@ -0,0 +1,43 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, |
||||
2020, 2021 Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
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 "PipelineStatisticsQuery.h" |
||||
|
||||
#ifndef MAGNUM_TARGET_WEBGL |
||||
#include <Corrade/Containers/StringView.h> |
||||
#endif |
||||
|
||||
#ifndef MAGNUM_TARGET_GLES |
||||
namespace Magnum { namespace GL { |
||||
|
||||
#ifndef MAGNUM_TARGET_WEBGL |
||||
PipelineStatisticsQuery& PipelineStatisticsQuery::setLabel(Containers::StringView label) { |
||||
AbstractQuery::setLabel(label); |
||||
return *this; |
||||
} |
||||
#endif |
||||
|
||||
}} |
||||
#endif |
||||
@ -0,0 +1,43 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, |
||||
2020, 2021 Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
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 "SampleQuery.h" |
||||
|
||||
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2)) |
||||
#ifndef MAGNUM_TARGET_WEBGL |
||||
#include <Corrade/Containers/StringView.h> |
||||
#endif |
||||
|
||||
namespace Magnum { namespace GL { |
||||
|
||||
#ifndef MAGNUM_TARGET_WEBGL |
||||
SampleQuery& SampleQuery::setLabel(Containers::StringView label) { |
||||
AbstractQuery::setLabel(label); |
||||
return *this; |
||||
} |
||||
#endif |
||||
|
||||
}} |
||||
#endif |
||||
@ -0,0 +1,41 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, |
||||
2020, 2021 Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
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 "TimeQuery.h" |
||||
|
||||
#ifndef MAGNUM_TARGET_WEBGL |
||||
#include <Corrade/Containers/StringView.h> |
||||
#endif |
||||
|
||||
namespace Magnum { namespace GL { |
||||
|
||||
#ifndef MAGNUM_TARGET_WEBGL |
||||
TimeQuery& TimeQuery::setLabel(Containers::StringView label) { |
||||
AbstractQuery::setLabel(label); |
||||
return *this; |
||||
} |
||||
#endif |
||||
|
||||
}} |
||||
Loading…
Reference in new issue