summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Lioncash2018-04-19 22:36:48 -0400
committerGravatar Lioncash2018-04-19 22:36:52 -0400
commitd9e316e3538c0c0891f04bbfd0e211749ba15b5d (patch)
treec218d1705222ae899c613427b01e1947a1c22893 /src/video_core
parentMerge pull request #356 from lioncash/shader (diff)
downloadyuzu-d9e316e3538c0c0891f04bbfd0e211749ba15b5d.tar.gz
yuzu-d9e316e3538c0c0891f04bbfd0e211749ba15b5d.tar.xz
yuzu-d9e316e3538c0c0891f04bbfd0e211749ba15b5d.zip
common_funcs: Remove ARRAY_SIZE macro
C++17 has non-member size() which we can just call where necessary.
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp4
1 files changed, 2 insertions, 2 deletions
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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <iterator>
5#include <glad/glad.h> 6#include <glad/glad.h>
6#include "common/common_funcs.h"
7#include "common/logging/log.h" 7#include "common/logging/log.h"
8#include "video_core/renderer_opengl/gl_state.h" 8#include "video_core/renderer_opengl/gl_state.h"
9 9
@@ -192,7 +192,7 @@ void OpenGLState::Apply() const {
192 } 192 }
193 193
194 // Textures 194 // Textures
195 for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { 195 for (size_t i = 0; i < std::size(texture_units); ++i) {
196 if (texture_units[i].texture_2d != cur_state.texture_units[i].texture_2d) { 196 if (texture_units[i].texture_2d != cur_state.texture_units[i].texture_2d) {
197 glActiveTexture(TextureUnits::MaxwellTexture(i).Enum()); 197 glActiveTexture(TextureUnits::MaxwellTexture(i).Enum());
198 glBindTexture(GL_TEXTURE_2D, texture_units[i].texture_2d); 198 glBindTexture(GL_TEXTURE_2D, texture_units[i].texture_2d);