diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-06-01 07:55:09 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-06-01 10:07:57 -0400 |
| commit | a9663669dc1037a04e37ae30efe18c0650547ac5 (patch) | |
| tree | b0bafacb909c3360951bb6b2781a94b97a9284be /Source/Core/VideoCommon/VertexLoaderManager.cpp | |
| parent | a4837a5c5dc5d71f4b93dcb2fd5b80c5cfab381a (diff) | |
Common/CommonFuncs: Remove now-unneccessary ArraySize function
Since C++17, non-member std::size() is present in the standard library
which also operates on regular C arrays. Given that, we can just replace
usages of ArraySize with that where applicable.
In many cases, we can just change the actual C array ArraySize() was
called on into a std::array and just use its .size() member function
instead.
In some other cases, we can collapse the loops they were used in, into a
ranged-for loop, eliminating the need for en explicit bounds query.
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoaderManager.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderManager.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index a57cb71929..3388f0d2bb 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -2,7 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoCommon/VertexLoaderManager.h" + #include <algorithm> +#include <iterator> #include <memory> #include <mutex> #include <string> @@ -11,7 +14,6 @@ #include <vector> #include "Common/Assert.h" -#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" @@ -23,7 +25,6 @@ #include "VideoCommon/RenderBase.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoaderBase.h" -#include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VertexShaderManager.h" @@ -168,21 +169,21 @@ NativeVertexFormat* GetUberVertexFormat(const PortableVertexDeclaration& decl) CopyAttribute(new_decl.position, decl.position); else MakeDummyAttribute(new_decl.position, VAR_FLOAT, 1, false); - for (size_t i = 0; i < ArraySize(new_decl.normals); i++) + for (size_t i = 0; i < std::size(new_decl.normals); i++) { if (decl.normals[i].enable) CopyAttribute(new_decl.normals[i], decl.normals[i]); else MakeDummyAttribute(new_decl.normals[i], VAR_FLOAT, 1, false); } - for (size_t i = 0; i < ArraySize(new_decl.colors); i++) + for (size_t i = 0; i < std::size(new_decl.colors); i++) { if (decl.colors[i].enable) CopyAttribute(new_decl.colors[i], decl.colors[i]); else MakeDummyAttribute(new_decl.colors[i], VAR_UNSIGNED_BYTE, 4, false); } - for (size_t i = 0; i < ArraySize(new_decl.texcoords); i++) + for (size_t i = 0; i < std::size(new_decl.texcoords); i++) { if (decl.texcoords[i].enable) CopyAttribute(new_decl.texcoords[i], decl.texcoords[i]); |
