diff options
| author | bunnei <bunneidev@gmail.com> | 2015-02-12 19:59:10 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-12 19:59:10 -0500 |
| commit | f7cde47911229c9265c73c10240a39ff9199fbb1 (patch) | |
| tree | 6ebf4112fdee49436fa43c5f49bc9b4a490e6f83 /src | |
| parent | ea54355d95e8b1b9afaffa3899b86db40992db6a (diff) | |
| parent | 5db62cc7580da1efd072284d40f51a7ed53eea61 (diff) | |
Merge pull request #561 from Alegend45/master
Fix Min and Max blend equations
Diffstat (limited to 'src')
| -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 617c767e7a..3faa101538 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp @@ -653,20 +653,22 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0, case params.Min: { + // TODO: GL spec says to do it without the factors, but is this what the 3DS does? Math::Vec4<int> result; - result.r() = std::min(src_result.r(),dst_result.r()); - result.g() = std::min(src_result.g(),dst_result.g()); - result.b() = std::min(src_result.b(),dst_result.b()); + result.r() = std::min(combiner_output.r(),dest.r()); + result.g() = std::min(combiner_output.g(),dest.g()); + result.b() = std::min(combiner_output.b(),dest.b()); combiner_output = result.Cast<u8>(); break; } case params.Max: { + // TODO: GL spec says to do it without the factors, but is this what the 3DS does? Math::Vec4<int> result; - result.r() = std::max(src_result.r(),dst_result.r()); - result.g() = std::max(src_result.g(),dst_result.g()); - result.b() = std::max(src_result.b(),dst_result.b()); + result.r() = std::max(combiner_output.r(),dest.r()); + result.g() = std::max(combiner_output.g(),dest.g()); + result.b() = std::max(combiner_output.b(),dest.b()); combiner_output = result.Cast<u8>(); break; } |