diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-04-19 22:09:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 22:09:51 -0700 |
| commit | 5d852467a25a749a729056edb4597173976a5820 (patch) | |
| tree | 2cb91989eaf317cb0b2fd6fa2fa052aa8836d05d /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
| parent | 941a3dda8a0505dc575cb71e1fc0ef4c1a13eca2 (diff) | |
| parent | 52a4489d6508388de50c34b27cd5f646ccd6f24f (diff) | |
Merge pull request #2666 from yuriks/gl-cleanups
PicaShaderConfig cleanups
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index de1d5eba7..a47307099 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -20,7 +20,6 @@ #include "video_core/regs_texturing.h" #include "video_core/renderer_opengl/gl_rasterizer.h" #include "video_core/renderer_opengl/gl_shader_gen.h" -#include "video_core/renderer_opengl/gl_shader_util.h" #include "video_core/renderer_opengl/pica_to_gl.h" #include "video_core/renderer_opengl/renderer_opengl.h" @@ -1005,7 +1004,7 @@ void RasterizerOpenGL::SamplerInfo::SyncWithConfig( } void RasterizerOpenGL::SetShader() { - PicaShaderConfig config = PicaShaderConfig::CurrentConfig(); + auto config = GLShader::PicaShaderConfig::BuildFromRegs(Pica::g_state.regs); std::unique_ptr<PicaShader> shader = std::make_unique<PicaShader>(); // Find (or generate) the GLSL shader for the current TEV state |