diff options
author | bunnei <bunneidev@gmail.com> | 2018-06-20 22:46:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-20 22:46:14 +0200 |
commit | c3e95086b66dfa4214892dcddb9fd6f865037c1e (patch) | |
tree | 859f41acecbdcfcbdf19df80903a045d6e2b0bcb /src/video_core/renderer_opengl/gl_state.cpp | |
parent | Implement GetAvailableLanguageCodes2 (#575) (diff) | |
parent | Build: Fixed some MSVC warnings in various parts of the code. (diff) | |
download | yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.gz yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.bz2 yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.lz yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.xz yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.zst yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index 44f0c8a01..1f1e48425 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -196,13 +196,13 @@ void OpenGLState::Apply() const { } // Textures - for (size_t i = 0; i < std::size(texture_units); ++i) { + for (int i = 0; i < std::size(texture_units); ++i) { if (texture_units[i].texture_2d != cur_state.texture_units[i].texture_2d) { glActiveTexture(TextureUnits::MaxwellTexture(i).Enum()); glBindTexture(GL_TEXTURE_2D, texture_units[i].texture_2d); } if (texture_units[i].sampler != cur_state.texture_units[i].sampler) { - glBindSampler(i, texture_units[i].sampler); + glBindSampler(static_cast<GLuint>(i), texture_units[i].sampler); } // Update the texture swizzle if (texture_units[i].swizzle.r != cur_state.texture_units[i].swizzle.r || |