Add support for constant folding of clamp()

src/OpenGL/compiler/ParseHelper.cpp

@@ -3629,24 +3629,48 @@ TIntermTyped *TParseContext::addFunctionCallOrMethod(TFunction *fnCall, TIntermN
 
 					callNode = aggregate;
 
-					if(fnCandidate->getParamCount() == 2)
+					if(op == EOpClamp)
 					{
+						// Special case for clamp -- try to fold it as min(max(t, minVal), maxVal)
 						TIntermSequence &parameters = paramNode->getAsAggregate()->getSequence();
-						TIntermTyped *left = parameters[0]->getAsTyped();
-						TIntermTyped *right = parameters[1]->getAsTyped();
+						TIntermConstantUnion *valConstant = parameters[0]->getAsTyped()->getAsConstantUnion();
+						TIntermConstantUnion *minConstant = parameters[1]->getAsTyped()->getAsConstantUnion();
+						TIntermConstantUnion *maxConstant = parameters[2]->getAsTyped()->getAsConstantUnion();
 
-						TIntermConstantUnion *leftTempConstant = left->getAsConstantUnion();
-						TIntermConstantUnion *rightTempConstant = right->getAsConstantUnion();
-						if (leftTempConstant && rightTempConstant)
+						if (valConstant && minConstant && maxConstant)
 						{
-							TIntermTyped *typedReturnNode = leftTempConstant->fold(op, rightTempConstant, infoSink());
-
-							if(typedReturnNode)
+							TIntermTyped *typedReturnNode = valConstant->fold(EOpMax, minConstant, infoSink());
+							if (typedReturnNode && typedReturnNode->getAsConstantUnion())
+							{
+								typedReturnNode = maxConstant->fold(EOpMin, typedReturnNode->getAsConstantUnion(), infoSink());
+							}
+							if (typedReturnNode)
 							{
 								callNode = typedReturnNode;
 							}
 						}
 					}
+					else
+					{
+						if(fnCandidate->getParamCount() == 2)
+						{
+							TIntermSequence &parameters = paramNode->getAsAggregate()->getSequence();
+							TIntermTyped *left = parameters[0]->getAsTyped();
+							TIntermTyped *right = parameters[1]->getAsTyped();
+
+							TIntermConstantUnion *leftTempConstant = left->getAsConstantUnion();
+							TIntermConstantUnion *rightTempConstant = right->getAsConstantUnion();
+							if (leftTempConstant && rightTempConstant)
+							{
+								TIntermTyped *typedReturnNode = leftTempConstant->fold(op, rightTempConstant, infoSink());
+
+								if(typedReturnNode)
+								{
+									callNode = typedReturnNode;
+								}
+							}
+						}
+					}
 				}
 			}
 			else