summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-02 14:57:42 -0400
committerGravatar GitHub2018-08-02 14:57:42 -0400
commitbae1822aede2a990c63c1a50b17ad526c1410cc3 (patch)
treebd9052141cb07a7a552889c3cfad066e85a3c0de /src
parentMerge pull request #891 from lioncash/ns (diff)
parentgl_state: Make texture_units a std::array (diff)
downloadyuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar.gz
yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.tar.xz
yuzu-bae1822aede2a990c63c1a50b17ad526c1410cc3.zip
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.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:
82 GLenum logic_op; // GL_LOGIC_OP_MODE 82 GLenum logic_op; // GL_LOGIC_OP_MODE
83 83
84 // 3 texture units - one for each that is used in PICA fragment shader emulation 84 // 3 texture units - one for each that is used in PICA fragment shader emulation
85 struct { 85 struct TextureUnit {
86 GLuint texture_2d; // GL_TEXTURE_BINDING_2D 86 GLuint texture_2d; // GL_TEXTURE_BINDING_2D
87 GLuint sampler; // GL_SAMPLER_BINDING 87 GLuint sampler; // GL_SAMPLER_BINDING
88 struct { 88 struct {
@@ -104,7 +104,8 @@ public:
104 Unbind(); 104 Unbind();
105 sampler = 0; 105 sampler = 0;
106 } 106 }
107 } texture_units[32]; 107 };
108 std::array<TextureUnit, 32> texture_units;
108 109
109 struct { 110 struct {
110 GLuint read_framebuffer; // GL_READ_FRAMEBUFFER_BINDING 111 GLuint read_framebuffer; // GL_READ_FRAMEBUFFER_BINDING