summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorDarius Goad <alegend45@gmail.com>2015-02-11 21:48:23 +0100
committerDarius Goad <alegend45@gmail.com>2015-02-11 22:33:44 +0100
commit5db62cc7580da1efd072284d40f51a7ed53eea61 (patch)
tree755afb22c28d2095e57dfe9fd160f2e5b1ce1b27 /src/video_core
parentMerge pull request #560 from lioncash/arm32 (diff)
downloadyuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar
yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar.gz
yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar.bz2
yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar.lz
yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar.xz
yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.tar.zst
yuzu-5db62cc7580da1efd072284d40f51a7ed53eea61.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/rasterizer.cpp14
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,
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;
}