diff options
| author | 2015-10-02 00:12:50 -0400 | |
|---|---|---|
| committer | 2015-10-21 21:51:24 -0400 | |
| commit | b02a533d946fbf98897ee42334a343d2aa4d7bf4 (patch) | |
| tree | 7762cfd27d5b7904593eecdead75abf35a4640d9 /src | |
| parent | gl_rasterizer: Fix typo in uploading TEV const color uniforms. (diff) | |
| download | yuzu-b02a533d946fbf98897ee42334a343d2aa4d7bf4.tar.gz yuzu-b02a533d946fbf98897ee42334a343d2aa4d7bf4.tar.xz yuzu-b02a533d946fbf98897ee42334a343d2aa4d7bf4.zip | |
gl_shader_util: Use vec3 constants for AppendColorCombiner.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_util.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp index 2c049e940..8a6a51ad4 100644 --- a/src/video_core/renderer_opengl/gl_shader_util.cpp +++ b/src/video_core/renderer_opengl/gl_shader_util.cpp | |||
| @@ -268,25 +268,25 @@ void AppendColorCombiner(std::string& shader, Pica::Regs::TevStageConfig::Operat | |||
| 268 | shader += variable_name + "[0] * " + variable_name + "[1]"; | 268 | shader += variable_name + "[0] * " + variable_name + "[1]"; |
| 269 | break; | 269 | break; |
| 270 | case Operation::Add: | 270 | case Operation::Add: |
| 271 | shader += "min(" + variable_name + "[0] + " + variable_name + "[1], 1.0)"; | 271 | shader += "min(" + variable_name + "[0] + " + variable_name + "[1], vec3(1.0))"; |
| 272 | break; | 272 | break; |
| 273 | case Operation::AddSigned: | 273 | case Operation::AddSigned: |
| 274 | shader += "clamp(" + variable_name + "[0] + " + variable_name + "[1] - vec3(0.5), 0.0, 1.0)"; | 274 | shader += "clamp(" + variable_name + "[0] + " + variable_name + "[1] - vec3(0.5), vec3(0.0), vec3(1.0))"; |
| 275 | break; | 275 | break; |
| 276 | case Operation::Lerp: | 276 | case Operation::Lerp: |
| 277 | shader += variable_name + "[0] * " + variable_name + "[2] + " + variable_name + "[1] * (vec3(1.0) - " + variable_name + "[2])"; | 277 | shader += variable_name + "[0] * " + variable_name + "[2] + " + variable_name + "[1] * (vec3(1.0) - " + variable_name + "[2])"; |
| 278 | break; | 278 | break; |
| 279 | case Operation::Subtract: | 279 | case Operation::Subtract: |
| 280 | shader += "max(" + variable_name + "[0] - " + variable_name + "[1], 0.0)"; | 280 | shader += "max(" + variable_name + "[0] - " + variable_name + "[1], vec3(0.0))"; |
| 281 | break; | 281 | break; |
| 282 | case Operation::MultiplyThenAdd: | 282 | case Operation::MultiplyThenAdd: |
| 283 | shader += "min(" + variable_name + "[0] * " + variable_name + "[1] + " + variable_name + "[2], 1.0)"; | 283 | shader += "min(" + variable_name + "[0] * " + variable_name + "[1] + " + variable_name + "[2], vec3(1.0))"; |
| 284 | break; | 284 | break; |
| 285 | case Operation::AddThenMultiply: | 285 | case Operation::AddThenMultiply: |
| 286 | shader += "min(" + variable_name + "[0] + " + variable_name + "[1], 1.0) * " + variable_name + "[2]"; | 286 | shader += "min(" + variable_name + "[0] + " + variable_name + "[1], vec3(1.0)) * " + variable_name + "[2]"; |
| 287 | break; | 287 | break; |
| 288 | default: | 288 | default: |
| 289 | shader += "0.0"; | 289 | shader += "vec3(0.0)"; |
| 290 | LOG_CRITICAL(Render_OpenGL, "Unknown color comb op %u", operation); | 290 | LOG_CRITICAL(Render_OpenGL, "Unknown color comb op %u", operation); |
| 291 | break; | 291 | break; |
| 292 | } | 292 | } |