diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-02 14:57:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 14:57:42 -0400 |
| commit | bae1822aede2a990c63c1a50b17ad526c1410cc3 (patch) | |
| tree | bd9052141cb07a7a552889c3cfad066e85a3c0de /src | |
| parent | e79e967151c6be6201fc8dd4743ee7675cfbefec (diff) | |
| parent | 6b32e241616af42253910a94584ac92b23fcfa20 (diff) | |
Merge pull request #902 from lioncash/array
gl_state: Make texture_units a std::array
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 5 |
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 |