Use nullptr consistently in TIntermConstantUnion::fold

Newly added code in TIntermConstantUnion::fold uses nullptr where as
remaining part of the function uses NULL. This change removes NULL and
consistently uses nullptr in complete function.

Change-Id: I600dcf11b686d8d72b2bcdac88b7158288c68105
Reviewed-on: https://chromium-review.googlesource.com/265395
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>
This commit is contained in:
Arun Patole 2015-04-08 14:26:25 +05:30 коммит произвёл Olli Etuaho
Родитель 2b1da6ed1d
Коммит 72ed20d4bb
1 изменённых файлов: 12 добавлений и 12 удалений

Просмотреть файл

@ -656,7 +656,7 @@ TIntermTyped *TIntermConstantUnion::fold(
ConstantUnion *unionArray = getUnionArrayPointer();
if (!unionArray)
return NULL;
return nullptr;
size_t objectSize = getType().getObjectSize();
@ -668,7 +668,7 @@ TIntermTyped *TIntermConstantUnion::fold(
TType returnType = getType();
if (!rightUnionArray)
return NULL;
return nullptr;
// for a case like float f = 1.2 + vec4(2,3,4,5);
if (constantNode->getType().getObjectSize() == 1 && objectSize > 1)
@ -725,7 +725,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Constant Folding cannot be done for matrix multiply");
return NULL;
return nullptr;
}
const int leftCols = getCols();
@ -839,7 +839,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Constant folding cannot be done for \"/\"");
return NULL;
return nullptr;
}
}
}
@ -852,7 +852,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Constant Folding cannot be done for matrix times vector");
return NULL;
return nullptr;
}
const int matrixCols = getCols();
@ -888,7 +888,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Constant Folding cannot be done for vector times matrix");
return NULL;
return nullptr;
}
const int matrixCols = constantNode->getType().getCols();
@ -1097,7 +1097,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Invalid operator for constant folding");
return NULL;
return nullptr;
}
tempNode = new TIntermConstantUnion(tempConstArray, returnType);
tempNode->setLine(getLine());
@ -1132,7 +1132,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Unary operation not folded into constant");
return NULL;
return nullptr;
}
break;
@ -1153,7 +1153,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Unary operation not folded into constant");
return NULL;
return nullptr;
}
break;
@ -1169,7 +1169,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Unary operation not folded into constant");
return NULL;
return nullptr;
}
break;
@ -1186,7 +1186,7 @@ TIntermTyped *TIntermConstantUnion::fold(
infoSink.info.message(
EPrefixInternalError, getLine(),
"Unary operation not folded into constant");
return NULL;
return nullptr;
}
break;
@ -1431,7 +1431,7 @@ TIntermTyped *TIntermConstantUnion::fold(
return nullptr;
default:
return NULL;
return nullptr;
}
}
newNode = new TIntermConstantUnion(tempConstArray, getType());