Merge pull request #2868 from wwylele/swr-tuple

SwRasterizer/Lighting: use make_tuple instead of constructor
This commit is contained in:
Weiyi Wang 2017-08-10 12:44:23 +03:00 committed by GitHub
commit 2415bad9ad

View File

@ -244,7 +244,7 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
MathUtil::Clamp(specular_sum.z, 0.0f, 1.0f) * 255,
MathUtil::Clamp(specular_sum.w, 0.0f, 1.0f) * 255)
.Cast<u8>();
return {diffuse, specular};
return std::make_tuple(diffuse, specular);
}
} // namespace Pica