Chromium Code Reviews| Index: src/gpu/GrDefaultGeoProcFactory.cpp |
| diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp |
| index f76acc6907b65242d423f2e749791af98f7ef34a..6268906bea681cabf74c293e7424926f186144a7 100644 |
| --- a/src/gpu/GrDefaultGeoProcFactory.cpp |
| +++ b/src/gpu/GrDefaultGeoProcFactory.cpp |
| @@ -234,14 +234,13 @@ private: |
| bool hasTransformedLocalCoords = SkToBool(gpTypeFlags & kTransformedLocalCoord_GPFlag); |
| bool hasLocalCoord = hasExplicitLocalCoords || hasTransformedLocalCoords; |
| bool hasCoverage = SkToBool(gpTypeFlags & kCoverage_GPFlag); |
|
robertphillips
2016/08/17 16:11:32
So, err, can't future adds move the array in memor
bsalomon
2016/08/17 16:14:31
Indeed! Will address in another CL.
|
| - fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType, |
| - kHigh_GrSLPrecision)); |
| + fInPosition = &this->addVertexAttrib("inPosition", kVec2f_GrVertexAttribType, |
| + kHigh_GrSLPrecision); |
| if (hasColor) { |
| - fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType)); |
| + fInColor = &this->addVertexAttrib("inColor", kVec4ub_GrVertexAttribType); |
| } |
| if (hasLocalCoord) { |
| - fInLocalCoords = &this->addVertexAttrib(Attribute("inLocalCoord", |
| - kVec2f_GrVertexAttribType)); |
| + fInLocalCoords = &this->addVertexAttrib("inLocalCoord", kVec2f_GrVertexAttribType); |
| if (hasExplicitLocalCoords) { |
| this->setHasExplicitLocalCoords(); |
| } else { |
| @@ -250,8 +249,7 @@ private: |
| } |
| } |
| if (hasCoverage) { |
| - fInCoverage = &this->addVertexAttrib(Attribute("inCoverage", |
| - kFloat_GrVertexAttribType)); |
| + fInCoverage = &this->addVertexAttrib("inCoverage", kFloat_GrVertexAttribType); |
| } |
| } |