Fix constant folding of vector compares.

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

Fix constant folding of vector compares.
5e0c3546 · Nicolas Capens · 0863f0df · 5e0c3546 · 5e0c3546
Commit 5e0c3546 authored Apr 05, 2016 by Nicolas Capens
Show whitespace changes
Inline Side-by-side

Showing with 50 additions and 25 deletions

ConstantUnion.h src/OpenGL/compiler/ConstantUnion.h +34 -0

Intermediate.cpp src/OpenGL/compiler/Intermediate.cpp +16 -25

No files found.
--- a/src/OpenGL/compiler/ConstantUnion.h
+++ b/src/OpenGL/compiler/ConstantUnion.h
@@ -207,6 +207,40 @@ public:
        return false;
    }
+	bool operator<=(const ConstantUnion& constant) const
+    {
+        assert(type == constant.type);
+        switch (type) {
+        case EbtInt:
+            return iConst <= constant.iConst;
+        case EbtUInt:
+            return uConst <= constant.uConst;
+        case EbtFloat:
+            return fConst <= constant.fConst;
+        default:
+            return false;   // Invalid operation, handled at semantic analysis
+        }
+        return false;
+    }
+	bool operator>=(const ConstantUnion& constant) const
+    {
+        assert(type == constant.type);
+        switch (type) {
+        case EbtInt:
+            return iConst >= constant.iConst;
+        case EbtUInt:
+            return uConst >= constant.uConst;
+        case EbtFloat:
+            return fConst >= constant.fConst;
+        default:
+            return false;   // Invalid operation, handled at semantic analysis
+        }
+        return false;
+    }
    ConstantUnion operator+(const ConstantUnion& constant) const
    {
        ConstantUnion returnValue;

--- a/src/OpenGL/compiler/Intermediate.cpp
+++ b/src/OpenGL/compiler/Intermediate.cpp
@@ -1539,38 +1539,29 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, TIntermTyped* constantNod
                break;
            case EOpLessThan:
-                assert(objectSize == 1);
+                tempConstArray = new ConstantUnion[objectSize];
-                tempConstArray = new ConstantUnion[1];
+                for(int i = 0; i < objectSize; i++)
-                tempConstArray->setBConst(*unionArray < *rightUnionArray);
+					tempConstArray[i].setBConst(unionArray[i] < rightUnionArray[i]);
-                returnType = TType(EbtBool, EbpUndefined, EvqConstExpr);
+                returnType = TType(EbtBool, EbpUndefined, EvqConstExpr, objectSize);
                break;
            case EOpGreaterThan:
-                assert(objectSize == 1);
+				tempConstArray = new ConstantUnion[objectSize];
-                tempConstArray = new ConstantUnion[1];
+                for(int i = 0; i < objectSize; i++)
-                tempConstArray->setBConst(*unionArray > *rightUnionArray);
+					tempConstArray[i].setBConst(unionArray[i] > rightUnionArray[i]);
-                returnType = TType(EbtBool, EbpUndefined, EvqConstExpr);
+                returnType = TType(EbtBool, EbpUndefined, EvqConstExpr, objectSize);
                break;
            case EOpLessThanEqual:
-                {
+                tempConstArray = new ConstantUnion[objectSize];
-                    assert(objectSize == 1);
+                for(int i = 0; i < objectSize; i++)
-                    ConstantUnion constant;
+					tempConstArray[i].setBConst(unionArray[i] <= rightUnionArray[i]);
-                    constant.setBConst(*unionArray > *rightUnionArray);
+                returnType = TType(EbtBool, EbpUndefined, EvqConstExpr, objectSize);
-                    tempConstArray = new ConstantUnion[1];
-                    tempConstArray->setBConst(!constant.getBConst());
-                    returnType = TType(EbtBool, EbpUndefined, EvqConstExpr);
                break;
-                }
            case EOpGreaterThanEqual:
-                {
+                tempConstArray = new ConstantUnion[objectSize];
-                    assert(objectSize == 1);
+                for(int i = 0; i < objectSize; i++)
-                    ConstantUnion constant;
+					tempConstArray[i].setBConst(unionArray[i] >= rightUnionArray[i]);
-                    constant.setBConst(*unionArray < *rightUnionArray);
+                returnType = TType(EbtBool, EbpUndefined, EvqConstExpr, objectSize);
-                    tempConstArray = new ConstantUnion[1];
-                    tempConstArray->setBConst(!constant.getBConst());
-                    returnType = TType(EbtBool, EbpUndefined, EvqConstExpr);
                break;
-                }
            case EOpEqual:
                if (getType().getBasicType() == EbtStruct) {
                    if (!CompareStructure(node->getType(), node->getUnionArrayPointer(), unionArray))