summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar bunnei2018-04-20 09:43:02 -0400
committerGravatar GitHub2018-04-20 09:43:02 -0400
commit701dd649e61470d3172390e138fd28b745dc20b4 (patch)
tree338a1669725ad9c0c01ee04bf69f57018a28e764 /src/video_core
parentMerge pull request #366 from lioncash/vec (diff)
parentcommon_funcs: Remove ARRAY_SIZE macro (diff)
downloadyuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar.gz
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.tar.xz
yuzu-701dd649e61470d3172390e138fd28b745dc20b4.zip
Merge pull request #363 from lioncash/array-size
common_funcs: Remove ARRAY_SIZE macro
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);