diff options
author | Markus Wick <markus@selfnet.de> | 2018-11-06 21:26:27 +0100 |
---|---|---|
committer | Markus Wick <markus@selfnet.de> | 2018-11-17 14:28:54 +0100 |
commit | 97f5c4ffd3950994b852b287e1d24f4766e53bea (patch) | |
tree | d2e2bc62afd33c68f5a601705782b26fbbb4f35f /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | Merge pull request #1678 from FearlessTobi/amiibo-hotkeys (diff) | |
download | yuzu-97f5c4ffd3950994b852b287e1d24f4766e53bea.tar yuzu-97f5c4ffd3950994b852b287e1d24f4766e53bea.tar.gz yuzu-97f5c4ffd3950994b852b287e1d24f4766e53bea.tar.bz2 yuzu-97f5c4ffd3950994b852b287e1d24f4766e53bea.tar.lz yuzu-97f5c4ffd3950994b852b287e1d24f4766e53bea.tar.xz yuzu-97f5c4ffd3950994b852b287e1d24f4766e53bea.tar.zst yuzu-97f5c4ffd3950994b852b287e1d24f4766e53bea.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 54cc47a9b..cb0d0c16a 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -183,15 +183,25 @@ void RasterizerOpenGL::SetupVertexFormat() { } state.draw.vertex_array = VAO.handle; state.ApplyVertexBufferState(); + + // Rebinding the VAO invalidates the vertex buffer bindings. + gpu.dirty_flags.vertex_array = 0xFFFFFFFF; } void RasterizerOpenGL::SetupVertexBuffer() { - MICROPROFILE_SCOPE(OpenGL_VB); - const auto& gpu = Core::System::GetInstance().GPU().Maxwell3D(); + auto& gpu = Core::System::GetInstance().GPU().Maxwell3D(); const auto& regs = gpu.regs; + if (!gpu.dirty_flags.vertex_array) + return; + + MICROPROFILE_SCOPE(OpenGL_VB); + // Upload all guest vertex arrays sequentially to our buffer for (u32 index = 0; index < Maxwell::NumVertexArrays; ++index) { + if (~gpu.dirty_flags.vertex_array & (1u << index)) + continue; + const auto& vertex_array = regs.vertex_array[index]; if (!vertex_array.IsEnabled()) continue; @@ -218,6 +228,8 @@ void RasterizerOpenGL::SetupVertexBuffer() { // Implicit set by glBindVertexBuffer. Stupid glstate handling... state.draw.vertex_buffer = buffer_cache.GetHandle(); + + gpu.dirty_flags.vertex_array = 0; } DrawParameters RasterizerOpenGL::SetupDraw() { @@ -575,7 +587,7 @@ void RasterizerOpenGL::DrawArrays() { return; MICROPROFILE_SCOPE(OpenGL_Drawing); - const auto& gpu = Core::System::GetInstance().GPU().Maxwell3D(); + auto& gpu = Core::System::GetInstance().GPU().Maxwell3D(); const auto& regs = gpu.regs; ScopeAcquireGLContext acquire_context{emu_window}; @@ -626,7 +638,11 @@ void RasterizerOpenGL::DrawArrays() { // Add space for at least 18 constant buffers buffer_size += Maxwell::MaxConstBuffers * (MaxConstbufferSize + uniform_buffer_alignment); - buffer_cache.Map(buffer_size); + bool invalidate = buffer_cache.Map(buffer_size); + if (invalidate) { + // As all cached buffers are invalidated, we need to recheck their state. + gpu.dirty_flags.vertex_attrib_format = 0xFFFFFFFF; + } SetupVertexFormat(); SetupVertexBuffer(); |