diff options
| author |  wwylele | 2017-08-10 11:56:55 +0300 |
|---|---|---|
| committer | wwylele | 2017-08-10 12:19:58 +0300 |
| commit | 5d9d42f0d0e0b2619e7412b86699a9b2b9dfa4ea (patch) | |
| tree | e39b13cbed6f7e90394fd6baf4e31d1f1b2aa44c /src | |
| parent | Merge pull request #2857 from j-selby/deploy-fix (diff) | |
| download | yuzu-5d9d42f0d0e0b2619e7412b86699a9b2b9dfa4ea.tar.gz yuzu-5d9d42f0d0e0b2619e7412b86699a9b2b9dfa4ea.tar.xz yuzu-5d9d42f0d0e0b2619e7412b86699a9b2b9dfa4ea.zip | |
SwRasterizer/Lighting: use make_tuple instead of constructor
implicit tuple constructor is a c++17 thing, which is not supported by some not-so-old libraries. Play safe for now
Diffstat (limited to '')
| -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 |