summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-09-01 05:54:31 +0200
committerbunnei <bunneidev@gmail.com>2018-09-08 08:53:37 +0200
commitb56e5edafcc18901c08634b1730f1e1870a14891 (patch)
treeb91531252b3743a2d62df9cf7b86a3e89a011ad7 /src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
parentMerge pull request #1257 from lioncash/process (diff)
downloadyuzu-b56e5edafcc18901c08634b1730f1e1870a14891.tar
yuzu-b56e5edafcc18901c08634b1730f1e1870a14891.tar.gz
yuzu-b56e5edafcc18901c08634b1730f1e1870a14891.tar.bz2
yuzu-b56e5edafcc18901c08634b1730f1e1870a14891.tar.lz
yuzu-b56e5edafcc18901c08634b1730f1e1870a14891.tar.xz
yuzu-b56e5edafcc18901c08634b1730f1e1870a14891.tar.zst
yuzu-b56e5edafcc18901c08634b1730f1e1870a14891.zip
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer_cache.cpp')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index f6b2c5a86..ea2e6a3a2 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -363,8 +363,8 @@ static void AllocateSurfaceTexture(GLuint texture, const FormatTuple& format_tup
OpenGLState cur_state = OpenGLState::GetCurState();
// Keep track of previous texture bindings
- GLuint old_tex = cur_state.texture_units[0].texture_2d;
- cur_state.texture_units[0].texture_2d = texture;
+ GLuint old_tex = cur_state.texture_units[0].texture;
+ cur_state.texture_units[0].texture = texture;
cur_state.Apply();
glActiveTexture(GL_TEXTURE0);
@@ -380,7 +380,7 @@ static void AllocateSurfaceTexture(GLuint texture, const FormatTuple& format_tup
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
// Restore previous texture bindings
- cur_state.texture_units[0].texture_2d = old_tex;
+ cur_state.texture_units[0].texture = old_tex;
cur_state.Apply();
}
@@ -600,8 +600,8 @@ void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle
GLuint target_tex = texture.handle;
OpenGLState cur_state = OpenGLState::GetCurState();
- GLuint old_tex = cur_state.texture_units[0].texture_2d;
- cur_state.texture_units[0].texture_2d = target_tex;
+ GLuint old_tex = cur_state.texture_units[0].texture;
+ cur_state.texture_units[0].texture = target_tex;
cur_state.Apply();
// Ensure no bad interactions with GL_UNPACK_ALIGNMENT
@@ -622,7 +622,7 @@ void CachedSurface::UploadGLTexture(GLuint read_fb_handle, GLuint draw_fb_handle
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
- cur_state.texture_units[0].texture_2d = old_tex;
+ cur_state.texture_units[0].texture = old_tex;
cur_state.Apply();
}