commit 5b41ba36f7931a74e7406096cc1bc0460e01761e
author Nicolas Capens <capn@google.com> Thu Dec 08 14:34:00 2016 -0500
committer Nicolas Capens <capn@google.com> Thu Dec 08 19:45:58 2016 +0000
tree a01b3c923cae862e2f18716a34bc87f472c2960c
parent 87852e1df6414583fa536b569db62e93821f6247

Fix rvalue types.

Change-Id: I98853d4858136553be730b07b02db95d1800035c
Reviewed-on: https://swiftshader-review.googlesource.com/8275
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/Reactor/SubzeroReactor.cpp

diff --git a/src/Reactor/SubzeroReactor.cpp b/src/Reactor/SubzeroReactor.cpp
index 5533630..327a510 100644
--- a/src/Reactor/SubzeroReactor.cpp
+++ b/src/Reactor/SubzeroReactor.cpp
@@ -3227,7 +3227,7 @@
 		pmulhw->addArg(y.value);
 		::basicBlock->appendInst(pmulhw);
 
-		return RValue<UShort4>(V(result));
+		return RValue<Short4>(V(result));
 	}
 
 	RValue<Int2> MulAdd(RValue<Short4> x, RValue<Short4> y)
@@ -3452,7 +3452,7 @@
 
 	RValue<UShort4> operator+(RValue<UShort4> lhs, RValue<UShort4> rhs)
 	{
-		return RValue<Short4>(Nucleus::createAdd(lhs.value, rhs.value));
+		return RValue<UShort4>(Nucleus::createAdd(lhs.value, rhs.value));
 	}
 
 	RValue<UShort4> operator-(RValue<UShort4> lhs, RValue<UShort4> rhs)
@@ -4032,7 +4032,7 @@
 
 	RValue<Int> operator++(Int &val, int)   // Post-increment
 	{
-		RValue<UInt> res = val;
+		RValue<Int> res = val;
 		val += 1;
 		return res;
 	}