Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Issue 900883002: Revert of Move DstCopy on gpu into the GrXferProcessor. (Closed)

Created:
5 years, 10 months ago by egdaniel
Modified:
5 years, 10 months ago
Reviewers:
joshualitt, bsalomon
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Revert of Move DstCopy on gpu into the GrXferProcessor. (patchset #8 id:140001 of https://codereview.chromium.org/885923002/) Reason for revert: Breaking xfermodes on some android devices Original issue's description: > Move DstCopy on gpu into the GrXferProcessor. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/74a11753604768bf461b80cabb66060e8564d82c TBR=joshualitt@google.com,bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+401 lines, -431 lines) Patch
M gyp/gpu.gypi View 2 chunks +0 lines, -3 lines 0 comments Download
M include/gpu/GrXferProcessor.h View 7 chunks +21 lines, -55 lines 0 comments Download
M include/gpu/effects/GrPorterDuffXferProcessor.h View 4 chunks +10 lines, -15 lines 0 comments Download
M src/effects/SkArithmeticMode_gpu.h View 5 chunks +12 lines, -19 lines 0 comments Download
M src/effects/SkArithmeticMode_gpu.cpp View 3 chunks +31 lines, -32 lines 0 comments Download
M src/gpu/GrBatchTarget.cpp View 2 chunks +4 lines, -2 lines 0 comments Download
M src/gpu/GrDrawTarget.h View 4 chunks +6 lines, -5 lines 0 comments Download
M src/gpu/GrDrawTarget.cpp View 9 chunks +44 lines, -13 lines 0 comments Download
M src/gpu/GrGpu.h View 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/GrInOrderDrawBuffer.h View 4 chunks +7 lines, -6 lines 0 comments Download
M src/gpu/GrInOrderDrawBuffer.cpp View 7 chunks +14 lines, -20 lines 0 comments Download
M src/gpu/GrPipeline.h View 2 chunks +5 lines, -2 lines 0 comments Download
M src/gpu/GrPipeline.cpp View 5 chunks +12 lines, -5 lines 0 comments Download
M src/gpu/GrPipelineBuilder.h View 1 chunk +4 lines, -3 lines 0 comments Download
M src/gpu/GrPipelineBuilder.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/gpu/GrProgramDesc.h View 2 chunks +17 lines, -0 lines 0 comments Download
M src/gpu/GrTest.cpp View 1 chunk +1 line, -0 lines 0 comments Download
D src/gpu/GrXferProcessor.cpp View 1 chunk +0 lines, -55 lines 0 comments Download
M src/gpu/effects/GrCoverageSetOpXP.h View 4 chunks +7 lines, -8 lines 0 comments Download
M src/gpu/effects/GrCoverageSetOpXP.cpp View 4 chunks +16 lines, -18 lines 0 comments Download
M src/gpu/effects/GrCustomXfermode.cpp View 2 chunks +20 lines, -20 lines 0 comments Download
M src/gpu/effects/GrCustomXfermodePriv.h View 5 chunks +12 lines, -15 lines 0 comments Download
M src/gpu/effects/GrDisableColorXP.h View 4 chunks +7 lines, -8 lines 0 comments Download
M src/gpu/effects/GrDisableColorXP.cpp View 4 chunks +8 lines, -10 lines 0 comments Download
M src/gpu/effects/GrPorterDuffXferProcessor.cpp View 5 chunks +19 lines, -30 lines 0 comments Download
M src/gpu/gl/GrGLGpu.h View 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/gl/GrGLGpu.cpp View 1 chunk +3 lines, -1 line 0 comments Download
M src/gpu/gl/GrGLProgram.cpp View 2 chunks +31 lines, -4 lines 0 comments Download
M src/gpu/gl/GrGLProgramDesc.h View 2 chunks +3 lines, -0 lines 0 comments Download
M src/gpu/gl/GrGLProgramDesc.cpp View 2 chunks +16 lines, -1 line 0 comments Download
M src/gpu/gl/GrGLXferProcessor.h View 2 chunks +4 lines, -14 lines 0 comments Download
D src/gpu/gl/GrGLXferProcessor.cpp View 1 chunk +0 lines, -61 lines 0 comments Download
M src/gpu/gl/builders/GrGLFragmentShaderBuilder.h View 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp View 1 chunk +49 lines, -2 lines 0 comments Download
M src/gpu/gl/builders/GrGLProgramBuilder.h View 1 chunk +5 lines, -0 lines 0 comments Download
M src/gpu/gl/builders/GrGLProgramBuilder.cpp View 1 chunk +6 lines, -0 lines 0 comments Download
M tests/GLProgramsTest.cpp View 2 chunks +2 lines, -2 lines 0 comments Download

Messages

Total messages: 5 (1 generated)
egdaniel
Created Revert of Move DstCopy on gpu into the GrXferProcessor.
5 years, 10 months ago (2015-02-04 14:04:23 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/900883002/1
5 years, 10 months ago (2015-02-04 14:05:06 UTC) #2
commit-bot: I haz the power
Failed to apply patch for src/gpu/GrBatchTarget.cpp: While running git apply --index -3 -p1; error: patch ...
5 years, 10 months ago (2015-02-04 14:05:22 UTC) #4
joshualitt
5 years, 10 months ago (2015-02-24 21:45:14 UTC) #5
On 2015/02/04 14:05:22, I haz the power (commit-bot) wrote:
> Failed to apply patch for src/gpu/GrBatchTarget.cpp:
> While running git apply --index -3 -p1;
>   error: patch failed: src/gpu/GrBatchTarget.cpp:37
>   Falling back to three-way merge...
>   Applied patch to 'src/gpu/GrBatchTarget.cpp' with conflicts.
>   U src/gpu/GrBatchTarget.cpp
> 
> Patch:       src/gpu/GrBatchTarget.cpp
> Index: src/gpu/GrBatchTarget.cpp
> diff --git a/src/gpu/GrBatchTarget.cpp b/src/gpu/GrBatchTarget.cpp
> index
>
d5d8d8f28508a386f9e35e4df85fbea5e7a801a9..6a3135310a7c611f1742f44497bfba71fbc8ca60
> 100644
> --- a/src/gpu/GrBatchTarget.cpp
> +++ b/src/gpu/GrBatchTarget.cpp
> @@ -21,7 +21,8 @@
>          BufferedFlush* bf = iter.get();
>          const GrPipeline* pipeline = bf->fPipeline;
>          const GrPrimitiveProcessor* primProc = bf->fPrimitiveProcessor.get();
> -        fGpu->buildProgramDesc(&desc, *primProc, *pipeline,
bf->fBatchTracker);
> +        fGpu->buildProgramDesc(&desc, *primProc, *pipeline,
> pipeline->descInfo(),
> +                               bf->fBatchTracker);
>  
>          GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker);
>          for (int i = 0; i < bf->fDraws.count(); i++) {
> @@ -37,7 +38,8 @@
>      BufferedFlush* bf = fIter.get();
>      const GrPipeline* pipeline = bf->fPipeline;
>      const GrPrimitiveProcessor* primProc = bf->fPrimitiveProcessor.get();
> -    fGpu->buildProgramDesc(&desc, *primProc, *pipeline, bf->fBatchTracker);
> +    fGpu->buildProgramDesc(&desc, *primProc, *pipeline, pipeline->descInfo(),
> +                           bf->fBatchTracker);
>  
>      GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker);
>      for (int i = 0; i < bf->fDraws.count(); i++) {

Greg, is it okay to close this?

Powered by Google App Engine
This is Rietveld 408576698