aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-01-21 22:08:29 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-01-21 22:08:29 +0000
commit1a2e8d233d91cc4c6622ff3d975ab7d50604c923 (patch)
tree8e283d36c4d6afb93064f2e52efbf84e0e349d8e /src/gpu
parent324f1bb181510b5b020247a67ba11cc731388271 (diff)
make xfermode warning printf be debug-only
git-svn-id: http://skia.googlecode.com/svn/trunk@720 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/SkGpuDevice.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 11f030eaac..4042006de4 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -353,7 +353,7 @@ bool SkGpuDevice::skPaint2GrPaintNoShader(const SkPaint& skPaint,
SkXfermode* mode = skPaint.getXfermode();
if (mode) {
if (!mode->asCoeff(&sm, &dm)) {
- SkDebugf("Unsupported xfer mode.\n");
+ SkDEBUGCODE(SkDebugf("Unsupported xfer mode.\n");)
#if 0
return false;
#endif
@@ -835,7 +835,7 @@ void SkGpuDevice::internalDrawBitmap(const SkDraw& draw,
SkFixedToScalar((srcRect.fBottom << 16)/ texture->allocHeight()));
SkRect dstRect;
- dstRect.set(SkIntToScalar(0),SkIntToScalar(0),
+ dstRect.set(SkIntToScalar(0),SkIntToScalar(0),
SkIntToScalar(srcRect.width()), SkIntToScalar(srcRect.height()));
SkRectFanSource texSrc(paintRect);
@@ -905,13 +905,13 @@ void SkGpuDevice::drawDevice(const SkDraw& draw, SkDevice* dev,
grPaint.fTextureMatrix.setIdentity();
fContext->drawRectToRect(grPaint,
- GrRect(GrIntToScalar(x),
- GrIntToScalar(y),
- GrIntToScalar(x + w),
+ GrRect(GrIntToScalar(x),
+ GrIntToScalar(y),
+ GrIntToScalar(x + w),
GrIntToScalar(y + h)),
- GrRect(0,
- 0,
- GrIntToScalar(max.fX),
+ GrRect(0,
+ 0,
+ GrIntToScalar(max.fX),
GrIntToScalar(max.fY)));
}
@@ -940,8 +940,8 @@ void SkGpuDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode,
return;
}
} else {
- if (!this->skPaint2GrPaintShader(paint, &act,
- *draw.fMatrix,
+ if (!this->skPaint2GrPaintShader(paint, &act,
+ *draw.fMatrix,
&grPaint)) {
return;
}