diff options
author | bunnei <bunneidev@gmail.com> | 2018-06-26 22:58:35 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-06-26 23:15:58 +0200 |
commit | 8447d20a117676360b0e7b08fc736e1d639e62fc (patch) | |
tree | b870a9a9aaef8a2e33ccd7e660728f65fe1488a2 /src/video_core/renderer_opengl/gl_state.cpp | |
parent | Merge pull request #590 from bunnei/rm-ssbo-check (diff) | |
download | yuzu-8447d20a117676360b0e7b08fc736e1d639e62fc.tar yuzu-8447d20a117676360b0e7b08fc736e1d639e62fc.tar.gz yuzu-8447d20a117676360b0e7b08fc736e1d639e62fc.tar.bz2 yuzu-8447d20a117676360b0e7b08fc736e1d639e62fc.tar.lz yuzu-8447d20a117676360b0e7b08fc736e1d639e62fc.tar.xz yuzu-8447d20a117676360b0e7b08fc736e1d639e62fc.tar.zst yuzu-8447d20a117676360b0e7b08fc736e1d639e62fc.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index 6e5f9a789..d1b3ad958 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -48,12 +48,7 @@ OpenGLState::OpenGLState() { logic_op = GL_COPY; for (auto& texture_unit : texture_units) { - texture_unit.texture_2d = 0; - texture_unit.sampler = 0; - texture_unit.swizzle.r = GL_RED; - texture_unit.swizzle.g = GL_GREEN; - texture_unit.swizzle.b = GL_BLUE; - texture_unit.swizzle.a = GL_ALPHA; + texture_unit.Reset(); } lighting_lut.texture_buffer = 0; @@ -338,10 +333,10 @@ void OpenGLState::Apply() const { cur_state = *this; } -OpenGLState& OpenGLState::ResetTexture(GLuint handle) { +OpenGLState& OpenGLState::UnbindTexture(GLuint handle) { for (auto& unit : texture_units) { if (unit.texture_2d == handle) { - unit.texture_2d = 0; + unit.Unbind(); } } if (lighting_lut.texture_buffer == handle) |