diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-07 19:14:45 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-07 19:14:45 +0000 |
| commit | a2a31928470dfb642880f6ab2e4d34b1c7f5d476 (patch) | |
| tree | e40e2e7fcef0807301bec7f5b0970d54bdc3e3f7 /include/gpu/GrContext.h | |
| parent | 7346df55c86a930afad54b0ff7aa6acf8f2a1e27 (diff) | |
Fix some extract subset bugs.
In SkBitmap::extractSubset, perform a deepCopy, if the pixelRef supports it.
Fixes a bug in the 'extractbitmap' gm, which attempts to draw a subset of a texture backed bitmap (if the canvas is really an SkGpuCanvas).
Also fix some bugs that happen when there is a pixel offset. These fixes get bypassed by the deepCopy, but a user can still set a pixel offset manually.
When copying GPU backed bitmap with a pixel offset, copy the offset.
If the new config is the same as the old, copy fRowBytes as well.
Add a function to SkBitmap.cpp (getUpperLeftFromOffset) to find the x,y coordinate to use when copying to a new config.
Fix a bug where readPixels copied to the correct desired config and we were setting the generation ID to match even though the desired config was not the same as the original config (caught by my new tests!).
Add some tests to verify the correct behavior.
Review URL: https://codereview.appspot.com/6839043
git-svn-id: http://skia.googlecode.com/svn/trunk@6710 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrContext.h')
| -rw-r--r-- | include/gpu/GrContext.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 7b14fdfafe..9bd6f7df2d 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -591,11 +591,15 @@ public: /** - * Copies all texels from one texture to another. + * Copies a rectangle of texels from src to dst. The size of dst is the size of the rectangle + * copied and topLeft is the position of the rect in src. The rectangle is clipped to src's + * bounds. * @param src the texture to copy from. * @param dst the render target to copy to. + * @param topLeft the point in src that will be copied to the top-left of dst. If NULL, + * (0, 0) will be used. */ - void copyTexture(GrTexture* src, GrRenderTarget* dst); + void copyTexture(GrTexture* src, GrRenderTarget* dst, const SkIPoint* topLeft = NULL); /** * Resolves a render target that has MSAA. The intermediate MSAA buffer is |