Title: [153600] trunk/Source/ThirdParty/ANGLE
- Revision
- 153600
- Author
- achristen...@apple.com
- Date
- 2013-08-01 13:21:01 -0700 (Thu, 01 Aug 2013)
Log Message
Fixed wrong static_casting in ANGLE from r153064.
https://bugs.webkit.org/show_bug.cgi?id=119296
Reviewed by Dean Jackson.
* src/compiler/Intermediate.cpp:
(TIntermediate::promoteConstantUnion):
Undid erroneous static_cast change.
* src/compiler/intermediate.h:
(TIntermConstantUnion::getIConst):
(TIntermConstantUnion::getFConst):
(TIntermConstantUnion::getBConst):
Made getters use size_t instead of int.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (153599 => 153600)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-01 20:10:52 UTC (rev 153599)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-01 20:21:01 UTC (rev 153600)
@@ -1,3 +1,19 @@
+2013-08-01 Alex Christensen <achristen...@apple.com>
+
+ Fixed wrong static_casting in ANGLE from r153064.
+ https://bugs.webkit.org/show_bug.cgi?id=119296
+
+ Reviewed by Dean Jackson.
+
+ * src/compiler/Intermediate.cpp:
+ (TIntermediate::promoteConstantUnion):
+ Undid erroneous static_cast change.
+ * src/compiler/intermediate.h:
+ (TIntermConstantUnion::getIConst):
+ (TIntermConstantUnion::getFConst):
+ (TIntermConstantUnion::getBConst):
+ Made getters use size_t instead of int.
+
2013-07-29 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Fix make distcheck.
Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp (153599 => 153600)
--- trunk/Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp 2013-08-01 20:10:52 UTC (rev 153599)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp 2013-08-01 20:21:01 UTC (rev 153600)
@@ -1371,13 +1371,13 @@
case EbtFloat:
switch (node->getType().getBasicType()) {
case EbtInt:
- leftUnionArray[i].setFConst(static_cast<float>(node->getIConst(static_cast<int>(i))));
+ leftUnionArray[i].setFConst(static_cast<float>(node->getIConst(i)));
break;
case EbtBool:
- leftUnionArray[i].setFConst(static_cast<float>(node->getBConst(static_cast<bool>(i))));
+ leftUnionArray[i].setFConst(static_cast<float>(node->getBConst(i)));
break;
case EbtFloat:
- leftUnionArray[i].setFConst(static_cast<float>(node->getFConst(static_cast<float>(i))));
+ leftUnionArray[i].setFConst(static_cast<float>(node->getFConst(i)));
break;
default:
infoSink.info.message(EPrefixInternalError, node->getLine(), "Cannot promote");
@@ -1387,13 +1387,13 @@
case EbtInt:
switch (node->getType().getBasicType()) {
case EbtInt:
- leftUnionArray[i].setIConst(static_cast<int>(node->getIConst(static_cast<int>(i))));
+ leftUnionArray[i].setIConst(static_cast<int>(node->getIConst(i)));
break;
case EbtBool:
- leftUnionArray[i].setIConst(static_cast<int>(node->getBConst(static_cast<bool>(i))));
+ leftUnionArray[i].setIConst(static_cast<int>(node->getBConst(i)));
break;
case EbtFloat:
- leftUnionArray[i].setIConst(static_cast<int>(node->getFConst(static_cast<float>(i))));
+ leftUnionArray[i].setIConst(static_cast<int>(node->getFConst(i)));
break;
default:
infoSink.info.message(EPrefixInternalError, node->getLine(), "Cannot promote");
@@ -1403,13 +1403,13 @@
case EbtBool:
switch (node->getType().getBasicType()) {
case EbtInt:
- leftUnionArray[i].setBConst(node->getIConst(static_cast<int>(i)) != 0);
+ leftUnionArray[i].setBConst(node->getIConst(i) != 0);
break;
case EbtBool:
- leftUnionArray[i].setBConst(node->getBConst(static_cast<bool>(i)));
+ leftUnionArray[i].setBConst(node->getBConst(i));
break;
case EbtFloat:
- leftUnionArray[i].setBConst(node->getFConst(static_cast<float>(i)) != 0.0f);
+ leftUnionArray[i].setBConst(node->getFConst(i) != 0.0f);
break;
default:
infoSink.info.message(EPrefixInternalError, node->getLine(), "Cannot promote");
Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/intermediate.h (153599 => 153600)
--- trunk/Source/ThirdParty/ANGLE/src/compiler/intermediate.h 2013-08-01 20:10:52 UTC (rev 153599)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/intermediate.h 2013-08-01 20:21:01 UTC (rev 153600)
@@ -369,9 +369,9 @@
ConstantUnion* getUnionArrayPointer() const { return unionArrayPointer; }
- int getIConst(int index) const { return unionArrayPointer ? unionArrayPointer[index].getIConst() : 0; }
- float getFConst(int index) const { return unionArrayPointer ? unionArrayPointer[index].getFConst() : 0.0f; }
- bool getBConst(int index) const { return unionArrayPointer ? unionArrayPointer[index].getBConst() : false; }
+ int getIConst(size_t index) const { return unionArrayPointer ? unionArrayPointer[index].getIConst() : 0; }
+ float getFConst(size_t index) const { return unionArrayPointer ? unionArrayPointer[index].getFConst() : 0.0f; }
+ bool getBConst(size_t index) const { return unionArrayPointer ? unionArrayPointer[index].getBConst() : false; }
virtual TIntermConstantUnion* getAsConstantUnion() { return this; }
virtual void traverse(TIntermTraverser*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
