From 40e28f62170b0031e9430a9ae6045e4852aa40cc Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 16 Apr 2017 20:47:04 -0700 Subject: OpenGL: Move Attributes enum to a more appropriate file --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 - 1 file changed, 1 deletion(-) (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 de1d5eba7..1e7022fb9 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" -- cgit v1.2.3 From a6fd4533f64fde7f7f7079a6758c87c995192a5f Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 16 Apr 2017 21:43:58 -0700 Subject: OpenGL: Move PicaShaderConfig to gl_shader_gen.h Also move the implementation of CurrentConfig to the cpp file. --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 1e7022fb9..150bb5e3c 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -1004,7 +1004,7 @@ void RasterizerOpenGL::SamplerInfo::SyncWithConfig( } void RasterizerOpenGL::SetShader() { - PicaShaderConfig config = PicaShaderConfig::CurrentConfig(); + GLShader::PicaShaderConfig config = GLShader::PicaShaderConfig::CurrentConfig(); std::unique_ptr shader = std::make_unique(); // Find (or generate) the GLSL shader for the current TEV state -- cgit v1.2.3 From 52a4489d6508388de50c34b27cd5f646ccd6f24f Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 16 Apr 2017 21:50:56 -0700 Subject: OpenGL: Pass Pica regs via parameter --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 150bb5e3c..a47307099 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -1004,7 +1004,7 @@ void RasterizerOpenGL::SamplerInfo::SyncWithConfig( } void RasterizerOpenGL::SetShader() { - GLShader::PicaShaderConfig config = GLShader::PicaShaderConfig::CurrentConfig(); + auto config = GLShader::PicaShaderConfig::BuildFromRegs(Pica::g_state.regs); std::unique_ptr shader = std::make_unique(); // Find (or generate) the GLSL shader for the current TEV state -- cgit v1.2.3