diff options
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrPathProcessor.cpp | 3 | ||||
-rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 3 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLGeometryProcessor.cpp | 7 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp index 6ecad59bc7..405152cea8 100644 --- a/src/gpu/GrPathProcessor.cpp +++ b/src/gpu/GrPathProcessor.cpp @@ -72,8 +72,7 @@ public: &v).toIndex(); fInstalledTransforms[i][t].fType = varyingType; - SkNEW_APPEND_TO_TARRAY(&(*tout)[i], GrGLSLTransformedCoords, - (SkString(v.fsIn()), varyingType)); + (*tout)[i].emplace_back(SkString(v.fsIn()), varyingType); } } } diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 52ef7b590b..905fcdeb96 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -92,8 +92,7 @@ void GrGLProgramBuilder::emitSamplers(const GrProcessor& processor, fUniformHandler.addUniform(GrGLSLUniformHandler::kFragment_Visibility, samplerType, kDefault_GrSLPrecision, name.c_str()); - SkNEW_APPEND_TO_TARRAY(outSamplers, GrGLSLTextureSampler, - (localSamplerUniforms[t], processor.textureAccess(t))); + outSamplers->emplace_back(localSamplerUniforms[t], processor.textureAccess(t)); if (kSamplerExternal_GrSLType == samplerType) { const char* externalFeatureString = this->glslCaps()->externalTextureExtensionString(); // We shouldn't ever create a GrGLTexture that requires external sampler type 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); } } } |