diff options
| author |  Subv | 2018-03-26 21:41:47 -0500 |
|---|---|---|
| committer |  James Rowe | 2018-04-06 20:40:24 -0600 |
| commit | 0171ec606bd9d6d66f7c566838aebf525d8e6dee (patch) | |
| tree | 36d59193cbf73166ec7dcbe6af0116d33ba8f2d4 /src | |
| parent | GL: Added functions to convert Maxwell tex filters and wrap modes to OpenGL. (diff) | |
| download | yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar.gz yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.tar.xz yuzu-0171ec606bd9d6d66f7c566838aebf525d8e6dee.zip | |
GL: Rename PicaTexture to MaxwellTexture.
Diffstat (limited to 'src')
| -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 { | |||
| 194 | // Textures | 194 | // Textures |
| 195 | for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { | 195 | for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { |
| 196 | if (texture_units[i].texture_2d != cur_state.texture_units[i].texture_2d) { | 196 | if (texture_units[i].texture_2d != cur_state.texture_units[i].texture_2d) { |
| 197 | glActiveTexture(TextureUnits::PicaTexture(i).Enum()); | 197 | glActiveTexture(TextureUnits::MaxwellTexture(i).Enum()); |
| 198 | glBindTexture(GL_TEXTURE_2D, texture_units[i].texture_2d); | 198 | glBindTexture(GL_TEXTURE_2D, texture_units[i].texture_2d); |
| 199 | } | 199 | } |
| 200 | if (texture_units[i].sampler != cur_state.texture_units[i].sampler) { | 200 | 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 { | |||
| 16 | } | 16 | } |
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | constexpr TextureUnit PicaTexture(int unit) { | 19 | constexpr TextureUnit MaxwellTexture(int unit) { |
| 20 | return TextureUnit{unit}; | 20 | return TextureUnit{unit}; |
| 21 | } | 21 | } |
| 22 | 22 | ||