aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-20 15:36:32 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-20 15:36:32 +0000
commitb3e40c04ef3021a3a3a0d64127388707217d7e74 (patch)
tree65a8233d657edb4296f288958da6555ead3fc9c7
parent55e713c697fdea27b13e45bffcdeaabf2a546b88 (diff)
Convert SkMatrix::I() assignments to SkMatrix::reset() calls
git-svn-id: http://skia.googlecode.com/svn/trunk@3441 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/gpu/GrAAConvexPathRenderer.cpp2
-rw-r--r--src/gpu/GrAAHairLinePathRenderer.cpp2
-rw-r--r--src/gpu/GrDefaultPathRenderer.cpp2
-rw-r--r--src/gpu/GrDrawTarget.cpp2
-rw-r--r--src/gpu/GrGpu.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 45ef699b11..7638067f1a 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -467,7 +467,7 @@ bool GrAAConvexPathRenderer::onDrawPath(const SkPath& origPath,
if (vm.invert(&ivm)) {
drawState->preConcatSamplerMatrices(stageMask, ivm);
}
- drawState->setViewMatrix(GrMatrix::I());
+ drawState->viewMatrix()->reset();
GrVertexLayout layout = 0;
for (int s = 0; s < GrDrawState::kNumStages; ++s) {
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index f24ce7b40d..3e5a1fa1ec 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -618,7 +618,7 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
if (drawState->getViewInverse(&ivm)) {
drawState->preConcatSamplerMatrices(stageMask, ivm);
}
- drawState->setViewMatrix(GrMatrix::I());
+ drawState->viewMatrix()->reset();
}
// TODO: See whether rendering lines as degenerate quads improves perf
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 7130bb5e27..791dc68ef1 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -488,7 +488,7 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
}
drawState->preConcatSamplerMatrices(stageMask, vmi);
}
- drawState->setViewMatrix(GrMatrix::I());
+ drawState->viewMatrix()->reset();
}
} else {
bounds = path.getBounds();
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 3dd86d2dfe..e9b7e49a98 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -1152,7 +1152,7 @@ GrDrawTarget::AutoDeviceCoordDraw::AutoDeviceCoordDraw(
fStageMask = 0;
}
}
- drawState->setViewMatrix(GrMatrix::I());
+ drawState->viewMatrix()->reset();
}
GrDrawTarget::AutoDeviceCoordDraw::~AutoDeviceCoordDraw() {
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 32338ca368..10c5c44a56 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -594,7 +594,7 @@ bool GrGpu::setupClipAndFlushState(GrPrimitiveType type) {
AutoStateRestore asr(this);
AutoGeometryPush agp(this);
- drawState->setViewMatrix(GrMatrix::I());
+ drawState->viewMatrix()->reset();
this->flushScissor(NULL);
#if !VISUALIZE_COMPLEX_CLIP
drawState->enableState(GrDrawState::kNoColorWrites_StateBit);