citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Pica/Rasterizer: Further enhance Tev support.

This commit is contained in:
Tony Wasserka 2014-12-21 02:57:56 +01:00
parent 36291bc3f6
commit 77bb58afeb
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/video_core/rasterizer.cpp
View File

@ -279,12 +279,15 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0,
} }
}; };
auto GetColorModifier = [](ColorModifier factor, const Math::Vec4<u8>& values) -> Math::Vec3<u8> { static auto GetColorModifier = [](ColorModifier factor, const Math::Vec4<u8>& values) -> Math::Vec3<u8> {
switch (factor) switch (factor)
{ {
case ColorModifier::SourceColor: case ColorModifier::SourceColor:
return values.rgb(); return values.rgb();
case ColorModifier::OneMinusSourceColor:
return (Math::Vec3<u8>(255, 255, 255) - values.rgb()).Cast<u8>();
case ColorModifier::SourceAlpha: case ColorModifier::SourceAlpha:
return { values.a(), values.a(), values.a() }; return { values.a(), values.a(), values.a() };
@ -295,7 +298,7 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0,
} }
}; };
auto GetAlphaModifier = [](AlphaModifier factor, u8 value) -> u8 { static auto GetAlphaModifier = [](AlphaModifier factor, u8 value) -> u8 {
switch (factor) { switch (factor) {
case AlphaModifier::SourceAlpha: case AlphaModifier::SourceAlpha:
return value; return value;
@ -310,7 +313,7 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0,
} }
}; };
auto ColorCombine = [](Operation op, const Math::Vec3<u8> input[3]) -> Math::Vec3<u8> { static auto ColorCombine = [](Operation op, const Math::Vec3<u8> input[3]) -> Math::Vec3<u8> {
switch (op) { switch (op) {
case Operation::Replace: case Operation::Replace:
return input[0]; return input[0];
@ -330,6 +333,15 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0,
case Operation::Lerp: case Operation::Lerp:
return ((input[0] * input[2] + input[1] * (Math::MakeVec<u8>(255, 255, 255) - input[2]).Cast<u8>()) / 255).Cast<u8>(); return ((input[0] * input[2] + input[1] * (Math::MakeVec<u8>(255, 255, 255) - input[2]).Cast<u8>()) / 255).Cast<u8>();
case Operation::Subtract:
{
auto result = input[0].Cast<int>() - input[1].Cast<int>();
result.r() = std::max(0, result.r());
result.g() = std::max(0, result.g());
result.b() = std::max(0, result.b());
return result.Cast<u8>();
}
default: default:
LOG_ERROR(HW_GPU, "Unknown color combiner operation %d\n", (int)op); LOG_ERROR(HW_GPU, "Unknown color combiner operation %d\n", (int)op);
_dbg_assert_(HW_GPU, 0); _dbg_assert_(HW_GPU, 0);
@ -337,7 +349,7 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0,
} }
}; };
auto AlphaCombine = [](Operation op, const std::array<u8,3>& input) -> u8 { static auto AlphaCombine = [](Operation op, const std::array<u8,3>& input) -> u8 {
switch (op) { switch (op) {
case Operation::Replace: case Operation::Replace:
return input[0]; return input[0];
@ -351,6 +363,9 @@ void ProcessTriangle(const VertexShader::OutputVertex& v0,
case Operation::Lerp: case Operation::Lerp:
return (input[0] * input[2] + input[1] * (255 - input[2])) / 255; return (input[0] * input[2] + input[1] * (255 - input[2])) / 255;
case Operation::Subtract:
return std::max(0, (int)input[0] - (int)input[1]);
default: default:
LOG_ERROR(HW_GPU, "Unknown alpha combiner operation %d\n", (int)op); LOG_ERROR(HW_GPU, "Unknown alpha combiner operation %d\n", (int)op);
_dbg_assert_(HW_GPU, 0); _dbg_assert_(HW_GPU, 0);