diff options
author | bunnei <bunneidev@gmail.com> | 2019-03-04 19:51:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-04 19:51:59 +0100 |
commit | 07e13d6728868e5cb91615bec3aa6dfe9ec62b7b (patch) | |
tree | a3a8cd6d9b85a120b5356d8abea79c5c0d754d25 /src/video_core | |
parent | Merge pull request #2188 from lioncash/log-static (diff) | |
parent | gl_rasterizer: Remove texture unbinding after dispatching a draw call (diff) | |
download | yuzu-07e13d6728868e5cb91615bec3aa6dfe9ec62b7b.tar yuzu-07e13d6728868e5cb91615bec3aa6dfe9ec62b7b.tar.gz yuzu-07e13d6728868e5cb91615bec3aa6dfe9ec62b7b.tar.bz2 yuzu-07e13d6728868e5cb91615bec3aa6dfe9ec62b7b.tar.lz yuzu-07e13d6728868e5cb91615bec3aa6dfe9ec62b7b.tar.xz yuzu-07e13d6728868e5cb91615bec3aa6dfe9ec62b7b.tar.zst yuzu-07e13d6728868e5cb91615bec3aa6dfe9ec62b7b.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 12 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index c8c1d6911..321d9dd3d 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -739,22 +739,10 @@ void RasterizerOpenGL::DrawArrays() { state.Apply(); res_cache.SignalPreDrawCall(); - - // Execute draw call params.DispatchDraw(); - res_cache.SignalPostDrawCall(); - // Disable scissor test - state.viewports[0].scissor.enabled = false; - accelerate_draw = AccelDraw::Disabled; - - // Unbind textures for potential future use as framebuffer attachments - for (auto& texture_unit : state.texture_units) { - texture_unit.Unbind(); - } - state.Apply(); } void RasterizerOpenGL::FlushAll() {} diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index 219f08053..9419326a3 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -461,7 +461,7 @@ void OpenGLState::ApplyTextures() const { if (has_delta) { glBindTextures(static_cast<GLuint>(first), static_cast<GLsizei>(last - first + 1), - textures.data()); + textures.data() + first); } } @@ -482,7 +482,7 @@ void OpenGLState::ApplySamplers() const { } if (has_delta) { glBindSamplers(static_cast<GLuint>(first), static_cast<GLsizei>(last - first + 1), - samplers.data()); + samplers.data() + first); } } |