diff options
| author | 2015-02-11 14:48:23 -0600 | |
|---|---|---|
| committer | 2015-02-11 15:33:44 -0600 | |
| commit | 5db62cc7580da1efd072284d40f51a7ed53eea61 (patch) | |
| tree | 755afb22c28d2095e57dfe9fd160f2e5b1ce1b27 /src/video_core/rasterizer.cpp | |
| parent | Merge pull request #560 from lioncash/arm32 (diff) | |
| download | yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar.gz yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar.xz yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.zip | |
Fix Min and Max blend equations
Diffstat (limited to 'src/video_core/rasterizer.cpp')
| -rw-r--r-- | src/video_core/rasterizer.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 617c767e7..3faa10153 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -653,20 +653,22 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0, | |||
| 653 | 653 | ||
| 654 | case params.Min: | 654 | case params.Min: |
| 655 | { | 655 | { |
| 656 | // TODO: GL spec says to do it without the factors, but is this what the 3DS does? | ||
| 656 | Math::Vec4<int> result; | 657 | Math::Vec4<int> result; |
| 657 | result.r() = std::min(src_result.r(),dst_result.r()); | 658 | result.r() = std::min(combiner_output.r(),dest.r()); |
| 658 | result.g() = std::min(src_result.g(),dst_result.g()); | 659 | result.g() = std::min(combiner_output.g(),dest.g()); |
| 659 | result.b() = std::min(src_result.b(),dst_result.b()); | 660 | result.b() = std::min(combiner_output.b(),dest.b()); |
| 660 | combiner_output = result.Cast<u8>(); | 661 | combiner_output = result.Cast<u8>(); |
| 661 | break; | 662 | break; |
| 662 | } | 663 | } |
| 663 | 664 | ||
| 664 | case params.Max: | 665 | case params.Max: |
| 665 | { | 666 | { |
| 667 | // TODO: GL spec says to do it without the factors, but is this what the 3DS does? | ||
| 666 | Math::Vec4<int> result; | 668 | Math::Vec4<int> result; |
| 667 | result.r() = std::max(src_result.r(),dst_result.r()); | 669 | result.r() = std::max(combiner_output.r(),dest.r()); |
| 668 | result.g() = std::max(src_result.g(),dst_result.g()); | 670 | result.g() = std::max(combiner_output.g(),dest.g()); |
| 669 | result.b() = std::max(src_result.b(),dst_result.b()); | 671 | result.b() = std::max(combiner_output.b(),dest.b()); |
| 670 | combiner_output = result.Cast<u8>(); | 672 | combiner_output = result.Cast<u8>(); |
| 671 | break; | 673 | break; |
| 672 | } | 674 | } |