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>

diff --git a/src/Reactor/SubzeroReactor.cpp b/src/Reactor/SubzeroReactor.cpp
index 5533630..327a510 100644 (file)
--- a/src/Reactor/SubzeroReactor.cpp
+++ b/src/Reactor/SubzeroReactor.cpp
@@ -3227,7 +3227,7 @@ namespace sw
                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 @@ namespace sw
 
        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 @@ namespace sw
 
        RValue<Int> operator++(Int &val, int)   // Post-increment
        {
-               RValue<UInt> res = val;
+               RValue<Int> res = val;
                val += 1;
                return res;
        }