diff options
| author | 2019-06-07 19:52:16 -0300 | |
|---|---|---|
| committer | 2019-06-07 19:52:16 -0300 | |
| commit | 5669ff3cbd5342aeac5ed00873cc37b412ea8b9e (patch) | |
| tree | 2282df54171a99a63596f229d859b13bc050f2f0 /src | |
| parent | video_core/engines: Move ConstBufferInfo out of Maxwell3D (diff) | |
| download | yuzu-5669ff3cbd5342aeac5ed00873cc37b412ea8b9e.tar.gz yuzu-5669ff3cbd5342aeac5ed00873cc37b412ea8b9e.tar.xz yuzu-5669ff3cbd5342aeac5ed00873cc37b412ea8b9e.zip | |
gl_rasterizer: Remove unused parameters in descriptor uploads
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 9 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index f3b84781c..d77426067 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -323,8 +323,8 @@ void RasterizerOpenGL::SetupShaders(GLenum primitive_mode) { | |||
| 323 | 323 | ||
| 324 | const auto stage_enum = static_cast<Maxwell::ShaderStage>(stage); | 324 | const auto stage_enum = static_cast<Maxwell::ShaderStage>(stage); |
| 325 | SetupDrawConstBuffers(stage_enum, shader); | 325 | SetupDrawConstBuffers(stage_enum, shader); |
| 326 | SetupGlobalRegions(stage_enum, shader, primitive_mode, base_bindings); | 326 | SetupGlobalRegions(stage_enum, shader); |
| 327 | SetupTextures(stage_enum, shader, program_handle, base_bindings); | 327 | SetupTextures(stage_enum, shader, base_bindings); |
| 328 | 328 | ||
| 329 | // Workaround for Intel drivers. | 329 | // Workaround for Intel drivers. |
| 330 | // When a clip distance is enabled but not set in the shader it crops parts of the screen | 330 | // When a clip distance is enabled but not set in the shader it crops parts of the screen |
| @@ -824,8 +824,7 @@ void RasterizerOpenGL::SetupConstBuffer(const Tegra::Engines::ConstBufferInfo& b | |||
| 824 | } | 824 | } |
| 825 | 825 | ||
| 826 | void RasterizerOpenGL::SetupGlobalRegions(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, | 826 | void RasterizerOpenGL::SetupGlobalRegions(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, |
| 827 | const Shader& shader, GLenum primitive_mode, | 827 | const Shader& shader) { |
| 828 | BaseBindings base_bindings) { | ||
| 829 | const auto& entries = shader->GetShaderEntries().global_memory_entries; | 828 | const auto& entries = shader->GetShaderEntries().global_memory_entries; |
| 830 | for (std::size_t bindpoint = 0; bindpoint < entries.size(); ++bindpoint) { | 829 | for (std::size_t bindpoint = 0; bindpoint < entries.size(); ++bindpoint) { |
| 831 | const auto& entry{entries[bindpoint]}; | 830 | const auto& entry{entries[bindpoint]}; |
| @@ -839,7 +838,7 @@ void RasterizerOpenGL::SetupGlobalRegions(Tegra::Engines::Maxwell3D::Regs::Shade | |||
| 839 | } | 838 | } |
| 840 | 839 | ||
| 841 | void RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, const Shader& shader, | 840 | void RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, const Shader& shader, |
| 842 | GLuint program_handle, BaseBindings base_bindings) { | 841 | BaseBindings base_bindings) { |
| 843 | MICROPROFILE_SCOPE(OpenGL_Texture); | 842 | MICROPROFILE_SCOPE(OpenGL_Texture); |
| 844 | const auto& gpu = system.GPU(); | 843 | const auto& gpu = system.GPU(); |
| 845 | const auto& maxwell3d = gpu.Maxwell3D(); | 844 | const auto& maxwell3d = gpu.Maxwell3D(); |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index dab08656f..f7671ff5d 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -116,12 +116,11 @@ private: | |||
| 116 | 116 | ||
| 117 | /// Configures the current global memory entries to use for the draw command. | 117 | /// Configures the current global memory entries to use for the draw command. |
| 118 | void SetupGlobalRegions(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, | 118 | void SetupGlobalRegions(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, |
| 119 | const Shader& shader, GLenum primitive_mode, | 119 | const Shader& shader); |
| 120 | BaseBindings base_bindings); | ||
| 121 | 120 | ||
| 122 | /// Configures the current textures to use for the draw command. | 121 | /// Configures the current textures to use for the draw command. |
| 123 | void SetupTextures(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, const Shader& shader, | 122 | void SetupTextures(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, const Shader& shader, |
| 124 | GLuint program_handle, BaseBindings base_bindings); | 123 | BaseBindings base_bindings); |
| 125 | 124 | ||
| 126 | /// Syncs the viewport and depth range to match the guest state | 125 | /// Syncs the viewport and depth range to match the guest state |
| 127 | void SyncViewport(OpenGLState& current_state); | 126 | void SyncViewport(OpenGLState& current_state); |