aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-02-09 11:32:56 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-09 11:32:56 -0800
commit85dc359f749c349bbd8e0ba56825b9457f654237 (patch)
tree0c0fa177c8cd4dad9a70e13027bea466abe283dc /src/gpu/glsl/GrGLSLGeometryProcessor.cpp
parent8273ca460fcde18ec884279fb9a41f330e92e0f9 (diff)
Remove SkNEW_APPEND_TO_TARRAY.
The use of SkNEW_APPEND_TO_TARRAY is now better served by SkTArray::emplace_back(...) which should now be used instead. The existing users of SkNEW_APPEND_TO_TARRAY are converted and the code relating to SkNEW_APPEND_TO_TARRAY is removed. TBR=reed This only removes code. The file should also be made private. Review URL: https://codereview.chromium.org/1682083002
Diffstat (limited to 'src/gpu/glsl/GrGLSLGeometryProcessor.cpp')
-rw-r--r--src/gpu/glsl/GrGLSLGeometryProcessor.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
index a8bd8ac4f8..967c18d284 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
@@ -62,8 +62,7 @@ void GrGLSLGeometryProcessor::emitTransforms(GrGLSLVertexBuilder* vb,
varyingHandler->addVarying(strVaryingName.c_str(), &v, precision);
SkASSERT(kVec2f_GrSLType == varyingType || kVec3f_GrSLType == varyingType);
- SkNEW_APPEND_TO_TARRAY(&(*tout)[i], GrGLSLTransformedCoords,
- (SkString(v.fsIn()), varyingType));
+ (*tout)[i].emplace_back(SkString(v.fsIn()), varyingType);
// varying = matrix * coords (logically)
if (kDevice_GrCoordSet == coordType) {
@@ -117,9 +116,7 @@ void GrGLSLGeometryProcessor::emitTransforms(GrGLSLVertexBuilder* vb,
varyingHandler->addVarying(strVaryingName.c_str(), &v, precision);
vb->codeAppendf("%s = %s;", v.vsOut(), localCoords);
- SkNEW_APPEND_TO_TARRAY(&(*tout)[i],
- GrGLSLTransformedCoords,
- (SkString(v.fsIn()), varyingType));
+ (*tout)[i].emplace_back(SkString(v.fsIn()), varyingType);
}
}
}