Browse Source

Merge pull request #2868 from wwylele/swr-tuple

SwRasterizer/Lighting: use make_tuple instead of constructor
Weiyi Wang 9 years ago
parent
commit
2415bad9ad
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/video_core/swrasterizer/lighting.cpp

+ 1 - 1
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.z, 0.0f, 1.0f) * 255,
                                          MathUtil::Clamp(specular_sum.w, 0.0f, 1.0f) * 255)
                                          MathUtil::Clamp(specular_sum.w, 0.0f, 1.0f) * 255)
                         .Cast<u8>();
                         .Cast<u8>();
-    return {diffuse, specular};
+    return std::make_tuple(diffuse, specular);
 }
 }
 
 
 } // namespace Pica
 } // namespace Pica