From 0af7e937638c3c4b9c12d8625c108adb6ed11791 Mon Sep 17 00:00:00 2001 From: Markus Wick Date: Fri, 10 Aug 2018 11:40:16 +0200 Subject: gl_state: Don't track constant buffer mappings. --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp') diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index fd4731d80..268b395a1 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -628,28 +628,17 @@ std::tuple RasterizerOpenGL::SetupConstBuffers( const auto& gpu = Core::System::GetInstance().GPU(); const auto& maxwell3d = gpu.Maxwell3D(); - // Reset all buffer draw state for this stage. - for (auto& buffer : state.draw.const_buffers[static_cast(stage)]) { - buffer.bindpoint = 0; - buffer.enabled = false; - } - // Upload only the enabled buffers from the 16 constbuffers of each shader stage const auto& shader_stage = maxwell3d.state.shader_stages[static_cast(stage)]; for (u32 bindpoint = 0; bindpoint < entries.size(); ++bindpoint) { const auto& used_buffer = entries[bindpoint]; const auto& buffer = shader_stage.const_buffers[used_buffer.GetIndex()]; - auto& buffer_draw_state = - state.draw.const_buffers[static_cast(stage)][used_buffer.GetIndex()]; if (!buffer.enabled) { continue; } - buffer_draw_state.enabled = true; - buffer_draw_state.bindpoint = current_bindpoint + bindpoint; - boost::optional addr = gpu.memory_manager->GpuToCpuAddress(buffer.address); size_t size = 0; @@ -676,9 +665,8 @@ std::tuple RasterizerOpenGL::SetupConstBuffers( std::tie(buffer_ptr, buffer_offset) = AlignBuffer(buffer_ptr, buffer_offset, static_cast(uniform_buffer_alignment)); - buffer_draw_state.size = size; - buffer_draw_state.offset = buffer_offset; - buffer_draw_state.ssbo = stream_buffer.GetHandle(); + glBindBufferRange(GL_UNIFORM_BUFFER, current_bindpoint + bindpoint, + stream_buffer.GetHandle(), buffer_offset, size); Memory::ReadBlock(*addr, buffer_ptr, size); buffer_ptr += size; @@ -689,7 +677,7 @@ std::tuple RasterizerOpenGL::SetupConstBuffers( const GLuint index = glGetProgramResourceIndex(program, GL_UNIFORM_BLOCK, buffer_name.c_str()); if (index != GL_INVALID_INDEX) { - glUniformBlockBinding(program, index, buffer_draw_state.bindpoint); + glUniformBlockBinding(program, index, current_bindpoint + bindpoint); } } -- cgit v1.2.3