summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2015-02-17 00:30:22 +0100
committerGravatar Tony Wasserka2015-02-17 00:30:22 +0100
commita78b8b1bc409cb78f06a45e26d3f9ac3767fb907 (patch)
treeb4c01135a95e292f747794ab4f2d1779b74e7b54 /src
parentMerge pull request #577 from Subv/err (diff)
parentVideoCore: Fix a typo in Vec4 MakeVec(T, Vec3<T>), where the second argument ... (diff)
downloadyuzu-a78b8b1bc409cb78f06a45e26d3f9ac3767fb907.tar.gz
yuzu-a78b8b1bc409cb78f06a45e26d3f9ac3767fb907.tar.xz
yuzu-a78b8b1bc409cb78f06a45e26d3f9ac3767fb907.zip
Merge pull request #578 from linkmauve/math-typo
VideoCore: Fix a typo in Vec4 MakeVec(T, Vec3<T>), where the second argument was Vec2<T> instead
Diffstat (limited to 'src')
-rw-r--r--src/video_core/math.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/math.h b/src/video_core/math.h
index c176b225a..f9a822658 100644
--- a/src/video_core/math.h
+++ b/src/video_core/math.h
@@ -631,7 +631,7 @@ static inline Vec4<T> MakeVec(const Vec3<T>& xyz, const T& w)
631} 631}
632 632
633template<typename T> 633template<typename T>
634static inline Vec4<T> MakeVec(const T& x, const Vec2<T>& yzw) 634static inline Vec4<T> MakeVec(const T& x, const Vec3<T>& yzw)
635{ 635{
636 return MakeVec(x, yzw[0], yzw[1], yzw[2]); 636 return MakeVec(x, yzw[0], yzw[1], yzw[2]);
637} 637}