diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-08-11 17:19:45 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-08-11 17:19:45 -0400 |
| commit | 93f607f5497a5fee142a0d2010881444a4ff0c80 (patch) | |
| tree | 3728be088656eed0f4d53fde0f4ca194d640bf82 /src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |
| parent | df25b047f870d84bf7d37ccbbaf9bfb88a2ccd7f (diff) | |
| parent | 254582aa35306c7bdebb90b0cd2dda88fe188087 (diff) | |
Merge pull request #1023 from yuriks/gl-state-bugs
OpenGL: Fix state tracking in situations with reused object handles
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer_cache.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index dc3ffdf2..70f0ba5f 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -30,6 +30,7 @@ void RasterizerCacheOpenGL::LoadAndBindTexture(OpenGLState &state, unsigned text new_texture->texture.Create(); state.texture_units[texture_unit].texture_2d = new_texture->texture.handle; state.Apply(); + glActiveTexture(GL_TEXTURE0 + texture_unit); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, PicaToGL::TextureFilterMode(config.config.mag_filter)); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, PicaToGL::TextureFilterMode(config.config.min_filter)); |