octo/yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #902 from lioncash/array

Browse Source 
gl_state: Make texture_units a std::array
This commit is contained in:
bunnei
2018-08-02 14:57:42 -04:00
committed by GitHub
parent e79e967151 6b32e24161
commit bae1822aed
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/renderer_opengl/gl_state.h
View File

@@ -82,7 +82,7 @@ public:
GLenum logic_op; // GL_LOGIC_OP_MODE GLenum logic_op; // GL_LOGIC_OP_MODE
// 3 texture units - one for each that is used in PICA fragment shader emulation // 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 texture_2d; // GL_TEXTURE_BINDING_2D
GLuint sampler; // GL_SAMPLER_BINDING GLuint sampler; // GL_SAMPLER_BINDING
struct { struct {
@@ -104,7 +104,8 @@ public:
Unbind(); Unbind();
sampler = 0; sampler = 0;
} }
} texture_units[32]; };
std::array<TextureUnit, 32> texture_units;
struct { struct {
GLuint read_framebuffer; // GL_READ_FRAMEBUFFER_BINDING GLuint read_framebuffer; // GL_READ_FRAMEBUFFER_BINDING