Replace GrMatrix with SkMatrix.
Review URL: https://codereview.appspot.com/6814067
git-svn-id: http://skia.googlecode.com/svn/trunk@6247 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index f652597..8fa39d2 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -323,7 +323,7 @@
// bits are ordered T0S0, T0S1, T0S2, ..., T1S0, T1S1, ...
// and start at bit 0.
GR_STATIC_ASSERT(sizeof(GrVertexLayout) <= sizeof(uint32_t));
- return (32 - Gr_clz(bit) - 1) / GrDrawState::kNumStages;
+ return (32 - SkCLZ(bit) - 1) / GrDrawState::kNumStages;
}
return -1;
}
@@ -1027,9 +1027,9 @@
////////////////////////////////////////////////////////////////////////////////
void GrDrawTarget::drawRect(const GrRect& rect,
- const GrMatrix* matrix,
+ const SkMatrix* matrix,
const GrRect* srcRects[],
- const GrMatrix* srcMatrices[]) {
+ const SkMatrix* srcMatrices[]) {
GrVertexLayout layout = GetRectVertexLayout(srcRects);
AutoReleaseGeometry geo(this, layout, 4, 0);
@@ -1070,9 +1070,9 @@
// Note: the color parameter will only be used when kColor_VertexLayoutBit
// is present in 'layout'
void GrDrawTarget::SetRectVertices(const GrRect& rect,
- const GrMatrix* matrix,
+ const SkMatrix* matrix,
const GrRect* srcRects[],
- const GrMatrix* srcMatrices[],
+ const SkMatrix* srcMatrices[],
GrColor color,
GrVertexLayout layout,
void* vertices) {