diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-02 20:57:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 20:57:42 +0200 |
| commit | bae1822aede2a990c63c1a50b17ad526c1410cc3 (patch) | |
| tree | bd9052141cb07a7a552889c3cfad066e85a3c0de | |
| parent | Merge pull request #891 from lioncash/ns (diff) | |
| parent | gl_state: Make texture_units a std::array (diff) | |
| download | yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar.gz yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar.bz2 yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar.lz yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar.xz yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar.zst yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.zip | |
| -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 |