From ae58e46036944ebadfed611b657911720383d60f Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 14 Apr 2018 11:42:07 -0500 Subject: GPU: Added a function to determine whether a shader stage is enabled or not. --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index f75d4c658..adc684f9e 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -191,8 +191,9 @@ void RasterizerOpenGL::SetupShaders(u8* buffer_ptr, GLintptr buffer_offset, size auto& shader_config = gpu.regs.shader_config[index]; const Maxwell::ShaderProgram program{static_cast(index)}; - // VertexB program is always enabled, despite bit setting - const bool is_enabled{shader_config.enable || program == Maxwell::ShaderProgram::VertexB}; + const auto& stage = index - 1; // Stage indices are 0 - 5 + + const bool is_enabled = gpu.IsShaderStageEnabled(static_cast(stage)); // Skip stages that are not enabled if (!is_enabled) { @@ -200,7 +201,6 @@ void RasterizerOpenGL::SetupShaders(u8* buffer_ptr, GLintptr buffer_offset, size } // Upload uniform data as one UBO per stage - const auto& stage = index - 1; // Stage indices are 0 - 5 const GLintptr ubo_offset = buffer_offset + static_cast(ptr_pos); copy_buffer(uniform_buffers[stage].handle, ubo_offset, sizeof(GLShader::MaxwellUniformData)); -- cgit v1.2.3 From 1957640ea25b34bec9e356a06dadf5937933c4ef Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 14 Apr 2018 11:45:23 -0500 Subject: GPU: Allow configuring ssbos in the opengl state manager. --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 8 ++++++++ src/video_core/renderer_opengl/gl_rasterizer.h | 2 ++ src/video_core/renderer_opengl/gl_state.cpp | 14 ++++++++++++++ src/video_core/renderer_opengl/gl_state.h | 6 ++++++ 4 files changed, 30 insertions(+) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index adc684f9e..71b862114 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -46,6 +46,14 @@ RasterizerOpenGL::RasterizerOpenGL() { state.texture_units[i].sampler = texture_samplers[i].sampler.handle; } + // Create SSBOs + for (size_t stage = 0; stage < ssbos.size(); ++stage) { + for (size_t buffer = 0; buffer < ssbos[stage].size(); ++buffer) { + ssbos[stage][buffer].Create(); + state.draw.const_buffers[stage][buffer].ssbo = ssbos[stage][buffer].handle; + } + } + GLint ext_num; glGetIntegerv(GL_NUM_EXTENSIONS, &ext_num); for (GLint i = 0; i < ext_num; i++) { diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 71c21c69b..527866e8a 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -129,6 +129,8 @@ private: std::array hw_vao_enabled_attributes; std::array texture_samplers; + std::array, 5> ssbos; + static constexpr size_t VERTEX_BUFFER_SIZE = 128 * 1024 * 1024; std::unique_ptr vertex_buffer; OGLBuffer uniform_buffer; diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index 6da3a7781..7b8a15ed2 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -202,6 +202,20 @@ void OpenGLState::Apply() const { } } + // Constbuffers + for (u32 stage = 0; stage < draw.const_buffers.size(); ++stage) { + for (u32 buffer_id = 0; buffer_id < draw.const_buffers[stage].size(); ++buffer_id) { + auto& current = cur_state.draw.const_buffers[stage][buffer_id]; + auto& new_state = draw.const_buffers[stage][buffer_id]; + if (current.enabled != new_state.enabled || current.bindpoint != new_state.bindpoint || + current.ssbo != new_state.ssbo) { + if (new_state.enabled) { + glBindBufferBase(GL_SHADER_STORAGE_BUFFER, new_state.bindpoint, new_state.ssbo); + } + } + } + } + // Lighting LUTs if (lighting_lut.texture_buffer != cur_state.lighting_lut.texture_buffer) { glActiveTexture(TextureUnits::LightingLUT.Enum()); diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index b18af14bb..6a80e6a7d 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h @@ -123,6 +123,12 @@ public: GLuint uniform_buffer; // GL_UNIFORM_BUFFER_BINDING GLuint shader_program; // GL_CURRENT_PROGRAM GLuint program_pipeline; // GL_PROGRAM_PIPELINE_BINDING + struct ConstBufferConfig { + bool enabled; + GLuint bindpoint; + GLuint ssbo; + }; + std::array, 5> const_buffers{}; } draw; struct { -- cgit v1.2.3 From c9b511da084bcf1655a7e844ee0d80e46ce681c9 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 14 Apr 2018 11:50:15 -0500 Subject: GPU: Upload the entirety of each constbuffer for each shader stage as SSBOs. We're going to need the shader generator to give us a mapping of the actual used const buffers to properly bind them to the shader. --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 39 +++++++++++++++++++++- src/video_core/renderer_opengl/gl_rasterizer.h | 7 +++- .../renderer_opengl/gl_shader_manager.cpp | 9 +---- src/video_core/renderer_opengl/gl_shader_manager.h | 7 ++-- 4 files changed, 48 insertions(+), 14 deletions(-) (limited to 'src/video_core/renderer_opengl') diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 71b862114..2a2268c20 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -306,6 +306,8 @@ void RasterizerOpenGL::DrawArrays() { // Sync and bind the texture surfaces BindTextures(); + // Configure the constant buffer objects + SetupConstBuffers(); // Viewport can have negative offsets or larger dimensions than our framebuffer sub-rect. Enable // scissor test to prevent drawing outside of the framebuffer region @@ -388,7 +390,7 @@ void RasterizerOpenGL::DrawArrays() { void RasterizerOpenGL::BindTextures() { using Regs = Tegra::Engines::Maxwell3D::Regs; - auto maxwell3d = Core::System::GetInstance().GPU().Get3DEngine(); + auto& maxwell3d = Core::System::GetInstance().GPU().Get3DEngine(); // Each Maxwell shader stage can have an arbitrary number of textures, but we're limited to a // certain number in OpenGL. We try to only use the minimum amount of host textures by not @@ -535,6 +537,41 @@ void RasterizerOpenGL::SamplerInfo::SyncWithConfig(const Tegra::Texture::TSCEntr } } +void RasterizerOpenGL::SetupConstBuffers() { + using Regs = Tegra::Engines::Maxwell3D::Regs; + auto& gpu = Core::System::GetInstance().GPU(); + auto& maxwell3d = gpu.Get3DEngine(); + + // Upload only the enabled buffers from the 16 constbuffers of each shader stage + u32 current_bindpoint = 0; + for (u32 stage = 0; stage < Regs::MaxShaderStage; ++stage) { + auto& shader_stage = maxwell3d.state.shader_stages[stage]; + bool stage_enabled = maxwell3d.IsShaderStageEnabled(static_cast(stage)); + + for (u32 buffer_id = 0; buffer_id < Regs::MaxConstBuffers; ++buffer_id) { + const auto& buffer = shader_stage.const_buffers[buffer_id]; + + state.draw.const_buffers[stage][buffer_id].enabled = buffer.enabled && stage_enabled; + + if (buffer.enabled && stage_enabled) { + state.draw.const_buffers[stage][buffer_id].bindpoint = current_bindpoint; + current_bindpoint++; + + VAddr addr = gpu.memory_manager->PhysicalToVirtualAddress(buffer.address); + const u8* data = Memory::GetPointer(addr); + glBindBuffer(GL_SHADER_STORAGE_BUFFER, + state.draw.const_buffers[stage][buffer_id].ssbo); + glBufferData(GL_SHADER_STORAGE_BUFFER, buffer.size, data, GL_DYNAMIC_DRAW); + glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0); + } else { + state.draw.const_buffers[stage][buffer_id].bindpoint = -1; + } + } + } + + state.Apply(); +} + void RasterizerOpenGL::BindFramebufferSurfaces(const Surface& color_surface, const Surface& depth_surface, bool has_stencil) { state.draw.draw_framebuffer = framebuffer.handle; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 527866e8a..bf3308aef 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -87,6 +87,9 @@ private: /// Binds the required textures to OpenGL before drawing a batch. void BindTextures(); + /// Configures the current constbuffers to use for the draw command. + void SetupConstBuffers(); + /// Syncs the viewport to match the guest state void SyncViewport(const MathUtil::Rectangle& surfaces_rect, u16 res_scale); @@ -129,7 +132,9 @@ private: std::array hw_vao_enabled_attributes; std::array texture_samplers; - std::array, 5> ssbos; + std::array, + Tegra::Engines::Maxwell3D::Regs::MaxShaderStage> + ssbos; static constexpr size_t VERTEX_BUFFER_SIZE = 128 * 1024 * 1024; std::unique_ptr vertex_buffer; diff --git a/src/video_core/renderer_opengl/gl_shader_manager.cpp b/src/video_core/renderer_opengl/gl_shader_manager.cpp index 7fceedce8..85b838faa 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.cpp +++ b/src/video_core/renderer_opengl/gl_shader_manager.cpp @@ -53,13 +53,6 @@ void SetShaderSamplerBindings(GLuint shader) { } // namespace Impl -void MaxwellUniformData::SetFromRegs(const Maxwell3D::State::ShaderStageInfo& shader_stage) { - const auto& memory_manager = Core::System().GetInstance().GPU().memory_manager; - for (unsigned index = 0; index < shader_stage.const_buffers.size(); ++index) { - const auto& const_buffer = shader_stage.const_buffers[index]; - const VAddr vaddr = memory_manager->PhysicalToVirtualAddress(const_buffer.address); - Memory::ReadBlock(vaddr, const_buffers[index].data(), sizeof(ConstBuffer)); - } -} +void MaxwellUniformData::SetFromRegs(const Maxwell3D::State::ShaderStageInfo& shader_stage) {} } // namespace GLShader diff --git a/src/video_core/renderer_opengl/gl_shader_manager.h b/src/video_core/renderer_opengl/gl_shader_manager.h index 5c8560cf5..f003ce532 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.h +++ b/src/video_core/renderer_opengl/gl_shader_manager.h @@ -30,11 +30,10 @@ void SetShaderSamplerBindings(GLuint shader); // Not following that rule will cause problems on some AMD drivers. struct MaxwellUniformData { void SetFromRegs(const Maxwell3D::State::ShaderStageInfo& shader_stage); - - using ConstBuffer = std::array; - alignas(16) std::array const_buffers; + // TODO(Subv): Use this for something. }; -static_assert(sizeof(MaxwellUniformData) == 1024, "MaxwellUniformData structure size is incorrect"); +// static_assert(sizeof(MaxwellUniformData) == 1024, "MaxwellUniformData structure size is +// incorrect"); static_assert(sizeof(MaxwellUniformData) < 16384, "MaxwellUniformData structure must be less than 16kb as per the OpenGL spec"); -- cgit v1.2.3