|
|
Created:
6 years, 2 months ago by Justin Novosad Modified:
6 years, 2 months ago CC:
reviews_skia.org Base URL:
https://skia.googlesource.com/skia.git@master Project:
skia Visibility:
Public. |
DescriptionChange GrContext::copyTexture to go through GrDrawTarget
BUG=crbug.com/415100
Committed: https://skia.googlesource.com/skia/+/96c118edff293af93db0a2b1b6775428117924b1
Patch Set 1 #
Total comments: 3
Patch Set 2 : response to feedback #
Total comments: 2
Messages
Total messages: 22 (5 generated)
junov@chromium.org changed reviewers: + bsalomon@google.com
PTAL
https://codereview.chromium.org/607993002/diff/1/src/gpu/GrContext.cpp File src/gpu/GrContext.cpp (left): https://codereview.chromium.org/607993002/diff/1/src/gpu/GrContext.cpp#oldcod... src/gpu/GrContext.cpp:1581: this->flush(); Pretty sure this is no longer necessary now that we go through GrDrawTarget. bsalomon? https://codereview.chromium.org/607993002/diff/1/src/gpu/GrContext.cpp File src/gpu/GrContext.cpp (right): https://codereview.chromium.org/607993002/diff/1/src/gpu/GrContext.cpp#newcod... src/gpu/GrContext.cpp:1590: GrDrawTarget* target = this->prepareToDraw(NULL, BUFFERED_DRAW, &are, &acf); This is just boilerplate stuff that I cargo-culted. Is BUFFERED_DRAW the right thing here?
junov@chromium.org changed reviewers: + robertphillips@google.com
On 2014/09/26 18:45:43, junov wrote: > PTAL This might obviate the CL I have here: https://codereview.chromium.org/609863002/ But I think you need to call flush() in SkBitmap::deepCopyTo() as my previous land caused a layout test failure due to this. Also, you can pass NULL for are and acf since you're passing NULL for the GrPaint param. Yup, BUFFERED_DRAW is right.
https://codereview.chromium.org/607993002/diff/1/src/gpu/GrContext.cpp File src/gpu/GrContext.cpp (left): https://codereview.chromium.org/607993002/diff/1/src/gpu/GrContext.cpp#oldcod... src/gpu/GrContext.cpp:1581: this->flush(); On 2014/09/26 18:48:23, junov wrote: > Pretty sure this is no longer necessary now that we go through GrDrawTarget. > bsalomon? correct
Could you change the name to copySurface and change the params to GrSurface*? Chromium code search doesn't show any callers outside Skia. When I made my comments on your previous CL, I hadn't put together that this was doing a draw but we already have support for a copySurface in GrDT. Duh!
New Patch
lgtm Might want to run through layout tests before committing to avoid any surprises.
On 2014/09/26 19:12:05, bsalomon wrote: > lgtm > > Might want to run through layout tests before committing to avoid any surprises. will do.
On 2014/09/26 19:17:36, junov wrote: > On 2014/09/26 19:12:05, bsalomon wrote: > > lgtm > > > > Might want to run through layout tests before committing to avoid any > surprises. > > will do. And there are failures...
On 2014/09/26 19:33:06, junov wrote: > On 2014/09/26 19:17:36, junov wrote: > > On 2014/09/26 19:12:05, bsalomon wrote: > > > lgtm > > > > > > Might want to run through layout tests before committing to avoid any > > surprises. > > > > will do. > > And there are failures... The failures are tests that pass on the second layout test run (single-process mode), and they were flaky before this change, so it is all just a red herring. Committing...
The CQ bit was checked by junov@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/607993002/20001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-Trybot on tryserver.skia (http://108.170.220.120:10117/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug...)
The CQ bit was checked by bsalomon@google.com
On 2014/09/26 19:59:22, I haz the power (commit-bot) wrote: > Try jobs failed on following builders: > Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-Trybot on tryserver.skia > (http://108.170.220.120:10117/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug...) Pushing the button again because the failure was on a no-GPU build and this is GPU-only code.
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/607993002/20001
Message was sent while issue was closed.
Committed patchset #2 (id:20001) as 96c118edff293af93db0a2b1b6775428117924b1
Message was sent while issue was closed.
Ex post facto nits. https://codereview.chromium.org/607993002/diff/20001/src/gpu/GrContext.cpp File src/gpu/GrContext.cpp (right): https://codereview.chromium.org/607993002/diff/20001/src/gpu/GrContext.cpp#ne... src/gpu/GrContext.cpp:1577: ASSERT_OWNED_RESOURCE(src); ASSERT_OWNED_RESOURCE(dst); ? https://codereview.chromium.org/607993002/diff/20001/src/gpu/SkGrPixelRef.cpp File src/gpu/SkGrPixelRef.cpp (right): https://codereview.chromium.org/607993002/diff/20001/src/gpu/SkGrPixelRef.cpp... src/gpu/SkGrPixelRef.cpp:56: static SkGrPixelRef* copy_to_new_texture_pixelref(GrTexture* texture, SkColorType dstCT, line this up? |