diff options
| author | 2016-04-21 16:39:36 -0400 | |
|---|---|---|
| committer | 2016-04-21 16:39:36 -0400 | |
| commit | 14cc1ed9112f87e04f60eaa2cc2119c71fd07147 (patch) | |
| tree | 759b051cdac62e843993b95e02f0a7cc4d9db89b /src | |
| parent | Merge pull request #1691 from linkmauve/improve-sdl-options (diff) | |
| parent | OpenGL: Implement color combiner Operation::Dot3_RGB (diff) | |
| download | yuzu-14cc1ed9112f87e04f60eaa2cc2119c71fd07147.tar.gz yuzu-14cc1ed9112f87e04f60eaa2cc2119c71fd07147.tar.xz yuzu-14cc1ed9112f87e04f60eaa2cc2119c71fd07147.zip | |
Merge pull request #1655 from JayFoxRox/hw-dot3
OpenGL: Implement color combiner Operation::Dot3_RGB
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_gen.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index ee4b54ab9..646b4eaaf 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp | |||
| @@ -198,6 +198,9 @@ static void AppendColorCombiner(std::string& out, TevStageConfig::Operation oper | |||
| 198 | case Operation::AddThenMultiply: | 198 | case Operation::AddThenMultiply: |
| 199 | out += "min(" + variable_name + "[0] + " + variable_name + "[1], vec3(1.0)) * " + variable_name + "[2]"; | 199 | out += "min(" + variable_name + "[0] + " + variable_name + "[1], vec3(1.0)) * " + variable_name + "[2]"; |
| 200 | break; | 200 | break; |
| 201 | case Operation::Dot3_RGB: | ||
| 202 | out += "vec3(dot(" + variable_name + "[0] - vec3(0.5), " + variable_name + "[1] - vec3(0.5)) * 4.0)"; | ||
| 203 | break; | ||
| 201 | default: | 204 | default: |
| 202 | out += "vec3(0.0)"; | 205 | out += "vec3(0.0)"; |
| 203 | LOG_CRITICAL(Render_OpenGL, "Unknown color combiner operation: %u", operation); | 206 | LOG_CRITICAL(Render_OpenGL, "Unknown color combiner operation: %u", operation); |