diff options
author | Subv <subv2112@gmail.com> | 2018-03-27 04:41:47 +0200 |
---|---|---|
committer | James Rowe <jroweboy@gmail.com> | 2018-04-07 04:40:24 +0200 |
commit | 0171ec606bd9d6d66f7c566838aebf525d8e6dee (patch) | |
tree | 36d59193cbf73166ec7dcbe6af0116d33ba8f2d4 | |
parent | GL: Added functions to convert Maxwell tex filters and wrap modes to OpenGL. (diff) | |
download | yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar.gz yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar.bz2 yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar.lz yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar.xz yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar.zst yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 2 |
2 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 1d396728b..6da3a7781 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -194,7 +194,7 @@ void OpenGLState::Apply() const { // Textures for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { if (texture_units[i].texture_2d != cur_state.texture_units[i].texture_2d) { - glActiveTexture(TextureUnits::PicaTexture(i).Enum()); + 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) { diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index c1f4efc8c..b18af14bb 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h @@ -16,7 +16,7 @@ struct TextureUnit { } }; -constexpr TextureUnit PicaTexture(int unit) { +constexpr TextureUnit MaxwellTexture(int unit) { return TextureUnit{unit}; } |