summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-04-20 15:43:02 +0200
committerGitHub <noreply@github.com>2018-04-20 15:43:02 +0200
commit701dd649e61470d3172390e138fd28b745dc20b4 (patch)
tree338a1669725ad9c0c01ee04bf69f57018a28e764
parentMerge pull request #366 from lioncash/vec (diff)
parentcommon_funcs: Remove ARRAY_SIZE macro (diff)
downloadyuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar.gz
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar.bz2
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar.lz
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar.xz
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar.zst
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.zip
-rw-r--r--src/common/common_funcs.h2
-rw-r--r--src/core/hle/kernel/svc.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp4
3 files changed, 4 insertions, 5 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 6f0604958..19a33cb57 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -9,8 +9,6 @@
#endif
#include "common/common_types.h"
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-
/// Textually concatenates two tokens. The double-expansion is required by the C preprocessor.
#define CONCAT2(x, y) DO_CONCAT2(x, y)
#define DO_CONCAT2(x, y) x##y
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 54b1d5d75..6204bcaaa 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -4,6 +4,7 @@
#include <algorithm>
#include <cinttypes>
+#include <iterator>
#include "common/logging/log.h"
#include "common/microprofile.h"
@@ -946,7 +947,7 @@ static const FunctionDef SVC_Table[] = {
};
static const FunctionDef* GetSVCInfo(u32 func_num) {
- if (func_num >= ARRAY_SIZE(SVC_Table)) {
+ if (func_num >= std::size(SVC_Table)) {
LOG_ERROR(Kernel_SVC, "unknown svc=0x%02X", func_num);
return nullptr;
}
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index 7b8a15ed2..f91dfe36a 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <iterator>
#include <glad/glad.h>
-#include "common/common_funcs.h"
#include "common/logging/log.h"
#include "video_core/renderer_opengl/gl_state.h"
@@ -192,7 +192,7 @@ void OpenGLState::Apply() const {
}
// Textures
- for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) {
+ for (size_t i = 0; i < std::size(texture_units); ++i) {
if (texture_units[i].texture_2d != cur_state.texture_units[i].texture_2d) {
glActiveTexture(TextureUnits::MaxwellTexture(i).Enum());
glBindTexture(GL_TEXTURE_2D, texture_units[i].texture_2d);