From 2a0f38ddc5d5a2207b8c314bee3686fb3e1e87ba Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 18 Feb 2015 17:32:18 -0500 Subject: [PATCH] Hack: Incomplete impl. for Dot3RGBA combiner operation. --- src/video_core/pica.h | 3 ++- src/video_core/rasterizer.cpp | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/video_core/pica.h b/src/video_core/pica.h index d03b811d3..23163300c 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -261,7 +261,8 @@ struct Regs { AddSigned = 3, Lerp = 4, Subtract = 5, - + Dot3RGB = 6, + Dot3RGBA = 7, MultiplyThenAdd = 8, AddThenMultiply = 9, }; diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 17f8f70ca..7813b2a17 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include "common/common_types.h" #include "common/math_util.h" @@ -439,6 +440,16 @@ static void ProcessTriangleInternal(const VertexShader::OutputVertex& v0, return result.Cast(); } + case Operation::Dot3RGBA: + { + //return std::inner_product(begin(a), end(a), begin(b), 0.0); + int a[] = { input[0].r(), input[0].g(), input[0].b() }; //int a[] = { 1, 3, -5 }; + int b[] = { input[1].r(), input[1].g(), input[1].b() }; + + auto res = std::inner_product(a, a + sizeof(a) / sizeof(a[0]), b, 0); + return{ res, res, res }; + } + case Operation::MultiplyThenAdd: { auto result = (input[0] * input[1] + 255 * input[2].Cast()) / 255; @@ -482,6 +493,9 @@ static void ProcessTriangleInternal(const VertexShader::OutputVertex& v0, case Operation::Subtract: return std::max(0, (int)input[0] - (int)input[1]); + case Operation::Dot3RGBA: + return 255; + case Operation::MultiplyThenAdd: return std::min(255, (input[0] * input[1] + 255 * input[2]) / 255);