Browse Source

Use arrayClear() instead of arrayResize(..., 0) now that it's available.

pull/674/head
Vladimír Vondruš 1 year ago
parent
commit
080fbbda88
  1. 2
      src/Magnum/DebugTools/FrameProfiler.cpp
  2. 5
      src/Magnum/GL/Context.cpp
  3. 4
      src/Magnum/MeshTools/Test/ConcatenateTest.cpp
  4. 2
      src/Magnum/MeshTools/Tipsify.cpp
  5. 8
      src/Magnum/Trade/AbstractSceneConverter.cpp
  6. 2
      src/MagnumPlugins/MagnumFont/MagnumFont.cpp

2
src/Magnum/DebugTools/FrameProfiler.cpp

@ -139,7 +139,7 @@ void FrameProfiler::enable() {
_beginFrameCalled = false; _beginFrameCalled = false;
#endif #endif
_measuredFrameCount = 0; _measuredFrameCount = 0;
arrayResize(_data, 0); arrayClear(_data);
/* Wipe out no longer relevant moving sums from all measurements, and /* Wipe out no longer relevant moving sums from all measurements, and
delayed measurement indices as well (tho for these it's not so delayed measurement indices as well (tho for these it's not so

5
src/Magnum/GL/Context.cpp

@ -1296,9 +1296,8 @@ Context::Configuration::~Configuration() = default;
Context::Configuration& Context::Configuration::operator=(const Configuration& other) { Context::Configuration& Context::Configuration::operator=(const Configuration& other) {
_flags = other._flags; _flags = other._flags;
arrayResize(_disabledWorkarounds, 0); arrayClear(_disabledWorkarounds);
/** @todo arrayClear(), ffs */ arrayClear(_disabledExtensions);
arrayResize(_disabledExtensions, NoInit, 0);
addDisabledWorkarounds(other._disabledWorkarounds); addDisabledWorkarounds(other._disabledWorkarounds);
addDisabledExtensions(other._disabledExtensions); addDisabledExtensions(other._disabledExtensions);
return *this; return *this;

4
src/Magnum/MeshTools/Test/ConcatenateTest.cpp

@ -471,9 +471,9 @@ void ConcatenateTest::concatenateInto() {
Containers::Array<char> vertexData; Containers::Array<char> vertexData;
Containers::Array<char> indexData; Containers::Array<char> indexData;
arrayResize(vertexData, DirectInit, (sizeof(Vector2) + sizeof(Vector3))*7, '\xff'); arrayResize(vertexData, DirectInit, (sizeof(Vector2) + sizeof(Vector3))*7, '\xff');
arrayResize(vertexData, 0); arrayClear(vertexData);
arrayResize(indexData, DirectInit, sizeof(UnsignedInt)*9, '\xff'); arrayResize(indexData, DirectInit, sizeof(UnsignedInt)*9, '\xff');
arrayResize(indexData, 0); arrayClear(indexData);
const void* attributeDataPointer = attributeData; const void* attributeDataPointer = attributeData;
const void* vertexDataPointer = vertexData; const void* vertexDataPointer = vertexData;
const void* indexDataPointer = indexData; const void* indexDataPointer = indexData;

2
src/Magnum/MeshTools/Tipsify.cpp

@ -62,7 +62,7 @@ template<class T> void tipsifyInPlaceImplementation(const Containers::StridedArr
UnsignedInt i = 0; UnsignedInt i = 0;
while(fanningVertex != 0xFFFFFFFFu) { while(fanningVertex != 0xFFFFFFFFu) {
/* Reset the candidates for this vertex */ /* Reset the candidates for this vertex */
arrayResize(candidates, 0); arrayClear(candidates);
/* For all neighbors of fanning vertex */ /* For all neighbors of fanning vertex */
for(UnsignedInt ti = neighborOffset[fanningVertex]; ti != neighborOffset[fanningVertex+1]; ++ti) { for(UnsignedInt ti = neighborOffset[fanningVertex]; ti != neighborOffset[fanningVertex+1]; ++ti) {

8
src/Magnum/Trade/AbstractSceneConverter.cpp

@ -1328,7 +1328,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor
} }
arrayReserve(levels, levelCount); arrayReserve(levels, levelCount);
arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ arrayClear(levels);
for(UnsignedInt j = 0; j != levelCount; ++j) { for(UnsignedInt j = 0; j != levelCount; ++j) {
if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) if((flags() & SceneConverterFlag::Verbose) && levelCount != 1)
Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing mesh" << i << "level" << j << "out of" << levelCount; Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing mesh" << i << "level" << j << "out of" << levelCount;
@ -1384,7 +1384,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor
} }
arrayReserve(levels, levelCount); arrayReserve(levels, levelCount);
arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ arrayClear(levels);
for(UnsignedInt j = 0; j != levelCount; ++j) { for(UnsignedInt j = 0; j != levelCount; ++j) {
if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) if((flags() & SceneConverterFlag::Verbose) && levelCount != 1)
Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 1D image" << i << "level" << j << "out of" << levelCount; Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 1D image" << i << "level" << j << "out of" << levelCount;
@ -1437,7 +1437,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor
} }
arrayReserve(levels, levelCount); arrayReserve(levels, levelCount);
arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ arrayClear(levels);
for(UnsignedInt j = 0; j != levelCount; ++j) { for(UnsignedInt j = 0; j != levelCount; ++j) {
if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) if((flags() & SceneConverterFlag::Verbose) && levelCount != 1)
Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 2D image" << i << "level" << j << "out of" << levelCount; Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 2D image" << i << "level" << j << "out of" << levelCount;
@ -1490,7 +1490,7 @@ bool AbstractSceneConverter::addImporterContentsInternal(AbstractImporter& impor
} }
arrayReserve(levels, levelCount); arrayReserve(levels, levelCount);
arrayResize(levels, NoInit, 0); /** @todo arrayClear() */ arrayClear(levels);
for(UnsignedInt j = 0; j != levelCount; ++j) { for(UnsignedInt j = 0; j != levelCount; ++j) {
if((flags() & SceneConverterFlag::Verbose) && levelCount != 1) if((flags() & SceneConverterFlag::Verbose) && levelCount != 1)
Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 3D image" << i << "level" << j << "out of" << levelCount; Debug{} << "Trade::AbstractSceneConverter::addImporterContents(): importing 3D image" << i << "level" << j << "out of" << levelCount;

2
src/MagnumPlugins/MagnumFont/MagnumFont.cpp

@ -206,7 +206,7 @@ Containers::Pointer<AbstractShaper> MagnumFont::doCreateShaper() {
const Containers::StringView text = textFull.slice(begin, end == ~UnsignedInt{} ? textFull.size() : end); const Containers::StringView text = textFull.slice(begin, end == ~UnsignedInt{} ? textFull.size() : end);
/* Get glyph codes from characters */ /* Get glyph codes from characters */
arrayResize(_glyphs, 0); arrayClear(_glyphs);
arrayReserve(_glyphs, text.size()); arrayReserve(_glyphs, text.size());
for(std::size_t i = 0; i != text.size(); ) { for(std::size_t i = 0; i != text.size(); ) {
const Containers::Pair<char32_t, std::size_t> codepointNext = Utility::Unicode::nextChar(text, i); const Containers::Pair<char32_t, std::size_t> codepointNext = Utility::Unicode::nextChar(text, i);

Loading…
Cancel
Save