diff options
| author | Weiyi Wang <wwylele@gmail.com> | 2017-08-10 12:44:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 12:44:23 +0300 |
| commit | 2415bad9ad32fade8ca76c506ba4d8827765b470 (patch) | |
| tree | e39b13cbed6f7e90394fd6baf4e31d1f1b2aa44c | |
| parent | 9f6868ad9bade0dee0a13f9d3b7cb88ec5c47f0c (diff) | |
| parent | 5d9d42f0d0e0b2619e7412b86699a9b2b9dfa4ea (diff) | |
Merge pull request #2868 from wwylele/swr-tuple
SwRasterizer/Lighting: use make_tuple instead of constructor
| -rw-r--r-- | src/video_core/swrasterizer/lighting.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/swrasterizer/lighting.cpp b/src/video_core/swrasterizer/lighting.cpp index 63088eee8..d61e6d572 100644 --- a/src/video_core/swrasterizer/lighting.cpp +++ b/src/video_core/swrasterizer/lighting.cpp @@ -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 |