diff options
| author | bunnei <bunneidev@gmail.com> | 2019-04-03 21:47:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-03 21:47:48 -0400 |
| commit | d7438d067f8c4f15e689f85dc92c244bdb134bf0 (patch) | |
| tree | 24495ef29ae433bb4116cf186dece3d29fcbccf7 /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
| parent | a655b59cef71e4af7d5ba7a7859fcf08c0dc4618 (diff) | |
| parent | c1ba3e3d4a36d1572ddf3ff35a3fddf861e2e07d (diff) | |
Merge pull request #2299 from lioncash/maxwell
gl_shader_manager: Remove reliance on a global accessor within MaxwellUniformData::SetFromRegs()
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 046fc935b..8f012db62 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -318,7 +318,7 @@ void RasterizerOpenGL::SetupShaders(GLenum primitive_mode) { const std::size_t stage{index == 0 ? 0 : index - 1}; // Stage indices are 0 - 5 GLShader::MaxwellUniformData ubo{}; - ubo.SetFromRegs(gpu.state.shader_stages[stage]); + ubo.SetFromRegs(gpu, stage); const GLintptr offset = buffer_cache.UploadHostMemory( &ubo, sizeof(ubo), static_cast<std::size_t>(uniform_buffer_alignment)); |
