diff options
| author | 2017-08-10 12:44:23 +0300 | |
|---|---|---|
| committer | 2017-08-10 12:44:23 +0300 | |
| commit | 2415bad9ad32fade8ca76c506ba4d8827765b470 (patch) | |
| tree | e39b13cbed6f7e90394fd6baf4e31d1f1b2aa44c /src/video_core/swrasterizer/lighting.cpp | |
| parent | Merge pull request #2857 from j-selby/deploy-fix (diff) | |
| parent | SwRasterizer/Lighting: use make_tuple instead of constructor (diff) | |
| download | yuzu-2415bad9ad32fade8ca76c506ba4d8827765b470.tar.gz yuzu-2415bad9ad32fade8ca76c506ba4d8827765b470.tar.xz yuzu-2415bad9ad32fade8ca76c506ba4d8827765b470.zip | |
Merge pull request #2868 from wwylele/swr-tuple
SwRasterizer/Lighting: use make_tuple instead of constructor
Diffstat (limited to 'src/video_core/swrasterizer/lighting.cpp')
| -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( | |||
| 244 | MathUtil::Clamp(specular_sum.z, 0.0f, 1.0f) * 255, | 244 | MathUtil::Clamp(specular_sum.z, 0.0f, 1.0f) * 255, |
| 245 | MathUtil::Clamp(specular_sum.w, 0.0f, 1.0f) * 255) | 245 | MathUtil::Clamp(specular_sum.w, 0.0f, 1.0f) * 255) |
| 246 | .Cast<u8>(); | 246 | .Cast<u8>(); |
| 247 | return {diffuse, specular}; | 247 | return std::make_tuple(diffuse, specular); |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | } // namespace Pica | 250 | } // namespace Pica |