diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-29 00:30:13 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-29 00:30:13 +0000 |
commit | e9c0469a491ddcbe5f1f90d0ac9f4337aa231c8b (patch) | |
tree | 60345ccf072239f2460592291bf5b528ce1cfc2f /src/gpu | |
parent | ecf1f3299a9dd16d19b3d6ba97f65102d3e577f8 (diff) |
Pseudo-reverted r4396 (SkGrPixelRef files are still in source pool but are unused)
git-svn-id: http://skia.googlecode.com/svn/trunk@4402 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index ee0d3c1032..c6f377d230 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -14,7 +14,7 @@ #include "GrDefaultTextContext.h" #include "GrTextContext.h" -#include "SkGrPixelRef.h" +#include "SkGrTexturePixelRef.h" #include "SkColorFilter.h" #include "SkDrawProcs.h" @@ -198,9 +198,9 @@ void SkGpuDevice::initFromRenderTarget(GrContext* context, // are ensuring that both objects will live as long as the pixel ref. SkPixelRef* pr; if (fTexture) { - pr = new SkGrPixelRef(fTexture); + pr = new SkGrTexturePixelRef(fTexture); } else { - pr = new SkGrPixelRef(fRenderTarget); + pr = new SkGrRenderTargetPixelRef(fRenderTarget); } this->setPixelRef(pr, 0)->unref(); @@ -243,7 +243,7 @@ SkGpuDevice::SkGpuDevice(GrContext* context, GrAssert(NULL != fRenderTarget); // wrap the bitmap with a pixelref to expose our texture - SkGrPixelRef* pr = new SkGrPixelRef(fTexture); + SkGrTexturePixelRef* pr = new SkGrTexturePixelRef(fTexture); this->setPixelRef(pr, 0)->unref(); } else { GrPrintf("--- failed to create gpu-offscreen [%d %d]\n", @@ -1599,7 +1599,7 @@ bool SkGpuDevice::filterImage(SkImageFilter* filter, const SkBitmap& src, SkIntToScalar(src.height())); GrTexture* resultTexture = filter_texture(fContext, texture, filter, rect); if (resultTexture) { - result->setPixelRef(new SkGrPixelRef(resultTexture))->unref(); + result->setPixelRef(new SkGrTexturePixelRef(resultTexture))->unref(); resultTexture->unref(); } return true; |