Index: src/gpu/GrInOrderDrawBuffer.cpp |
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp |
index dc074b7b511e5ebf95fe7a1c13df9f1b9cd4132b..bc5571593d02d94e3447ee2a2ef3a9a7f5ffdf6c 100644 |
--- a/src/gpu/GrInOrderDrawBuffer.cpp |
+++ b/src/gpu/GrInOrderDrawBuffer.cpp |
@@ -64,11 +64,17 @@ void get_vertex_bounds(const void* vertices, |
*/ |
static const GrGeometryProcessor* create_rect_gp(GrDrawState* drawState, |
bool hasLocalCoords, |
- GrColor color) { |
+ GrColor color, |
+ const SkMatrix* primProcLocalMatrix) { |
uint32_t flags = GrDefaultGeoProcFactory::kPosition_GPType | |
GrDefaultGeoProcFactory::kColor_GPType; |
flags |= hasLocalCoords ? GrDefaultGeoProcFactory::kLocalCoord_GPType : 0; |
- return GrDefaultGeoProcFactory::Create(color, flags, GrColorIsOpaque(color)); |
+ if (primProcLocalMatrix) { |
+ return GrDefaultGeoProcFactory::Create(color, flags, GrColorIsOpaque(color), 0xff, |
+ *primProcLocalMatrix); |
+ } else { |
+ return GrDefaultGeoProcFactory::Create(color, flags, GrColorIsOpaque(color)); |
+ } |
} |
static bool path_fill_type_is_winding(const GrStencilSettings& pathStencilSettings) { |
@@ -112,10 +118,12 @@ void GrInOrderDrawBuffer::onDrawRect(GrDrawState* ds, |
GrColor color, |
const SkRect& rect, |
const SkRect* localRect, |
- const SkMatrix* localMatrix) { |
+ const SkMatrix* localMatrix, |
+ const SkMatrix* primProcLocalMatrix) { |
GrDrawState::AutoRestoreEffects are(ds); |
- SkAutoTUnref<const GrGeometryProcessor> gp(create_rect_gp(ds, SkToBool(localRect), color)); |
+ SkAutoTUnref<const GrGeometryProcessor> gp(create_rect_gp(ds, SkToBool(localRect), color, |
+ primProcLocalMatrix)); |
size_t vstride = gp->getVertexStride(); |
SkASSERT(vstride == sizeof(SkPoint) + sizeof(GrColor) + (SkToBool(localRect) ? sizeof(SkPoint) : |