Index: src/gpu/SkGpuDevice.cpp |
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp |
index 22f01f92e81ce2076d517119887f8b344c79ddb7..bfc3695f3efa26a5b1e4d1cdf11ec029235f8ac3 100644 |
--- a/src/gpu/SkGpuDevice.cpp |
+++ b/src/gpu/SkGpuDevice.cpp |
@@ -449,9 +449,9 @@ void SkGpuDevice::prepareDraw(const SkDraw& draw, bool forceIdentity) { |
DO_DEFERRED_CLEAR(); |
} |
-SkGpuRenderTarget* SkGpuDevice::accessRenderTarget() { |
+GrRenderTarget* SkGpuDevice::accessRenderTarget() { |
DO_DEFERRED_CLEAR(); |
- return (SkGpuRenderTarget*)fRenderTarget; |
+ return fRenderTarget; |
} |
bool SkGpuDevice::bindDeviceAsTexture(GrPaint* paint) { |
@@ -1494,8 +1494,8 @@ void SkGpuDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap, |
SkBitmap filterBitmap; |
if (filter_texture(this, fContext, texture, filter, w, h, &filterBitmap)) { |
grPaint.colorStage(kBitmapEffectIdx)->setEffect( |
- GrSimpleTextureEffect::Create((GrTexture*) filterBitmap.getTexture(), SkMatrix::I()))->unref(); |
- texture = (GrTexture*) filterBitmap.getTexture(); |
+ GrSimpleTextureEffect::Create(filterBitmap.getTexture(), SkMatrix::I()))->unref(); |
+ texture = filterBitmap.getTexture(); |
w = filterBitmap.width(); |
h = filterBitmap.height(); |
} |
@@ -1571,8 +1571,8 @@ void SkGpuDevice::drawDevice(const SkDraw& draw, SkDevice* device, |
SkBitmap filterBitmap; |
if (filter_texture(this, fContext, devTex, filter, w, h, &filterBitmap)) { |
grPaint.colorStage(kBitmapEffectIdx)->setEffect( |
- GrSimpleTextureEffect::Create((GrTexture*) filterBitmap.getTexture(), SkMatrix::I()))->unref(); |
- devTex = (GrTexture*) filterBitmap.getTexture(); |
+ GrSimpleTextureEffect::Create(filterBitmap.getTexture(), SkMatrix::I()))->unref(); |
+ devTex = filterBitmap.getTexture(); |
w = filterBitmap.width(); |
h = filterBitmap.height(); |
} |