summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-02 11:19:55 -0400
committerLioncash <mathew1800@gmail.com>2018-08-02 11:19:58 -0400
commit6b32e241616af42253910a94584ac92b23fcfa20 (patch)
tree4b5278fd66a0c4904a2722d99c721ef736d385c8 /src
parenta03c644aed943397f7a4e44715a167e0471b6262 (diff)
gl_state: Make texture_units a std::array
Gets rid of the use of a raw C array.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_state.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h
index 3398d7c04..24b1d956b 100644
--- a/src/video_core/renderer_opengl/gl_state.h
+++ b/src/video_core/renderer_opengl/gl_state.h
@@ -82,7 +82,7 @@ public:
GLenum logic_op; // GL_LOGIC_OP_MODE
// 3 texture units - one for each that is used in PICA fragment shader emulation
- struct {
+ struct TextureUnit {
GLuint texture_2d; // GL_TEXTURE_BINDING_2D
GLuint sampler; // GL_SAMPLER_BINDING
struct {
@@ -104,7 +104,8 @@ public:
Unbind();
sampler = 0;
}
- } texture_units[32];
+ };
+ std::array<TextureUnit, 32> texture_units;
struct {
GLuint read_framebuffer; // GL_READ_FRAMEBUFFER_BINDING