| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2015 Google Inc. | 2  * Copyright 2015 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "GrCommandBuilder.h" | 8 #include "GrCommandBuilder.h" | 
| 9 | 9 | 
| 10 #include "GrInOrderCommandBuilder.h" | 10 #include "GrInOrderCommandBuilder.h" | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 66                                                            const SkIRect& srcRec
    t, | 66                                                            const SkIRect& srcRec
    t, | 
| 67                                                            const SkIPoint& dstPo
    int) { | 67                                                            const SkIPoint& dstPo
    int) { | 
| 68     CopySurface* cs = GrNEW_APPEND_TO_RECORDER(*this->cmdBuffer(), CopySurface, 
    (dst, src)); | 68     CopySurface* cs = GrNEW_APPEND_TO_RECORDER(*this->cmdBuffer(), CopySurface, 
    (dst, src)); | 
| 69     cs->fSrcRect = srcRect; | 69     cs->fSrcRect = srcRect; | 
| 70     cs->fDstPoint = dstPoint; | 70     cs->fDstPoint = dstPoint; | 
| 71     return cs; | 71     return cs; | 
| 72 } | 72 } | 
| 73 | 73 | 
| 74 GrTargetCommands::Cmd* | 74 GrTargetCommands::Cmd* | 
| 75 GrCommandBuilder::recordXferBarrierIfNecessary(const GrPipeline& pipeline, | 75 GrCommandBuilder::recordXferBarrierIfNecessary(const GrPipeline& pipeline, | 
| 76                                                const GrDrawTargetCaps& caps) { | 76                                                const GrCaps& caps) { | 
| 77     const GrXferProcessor& xp = *pipeline.getXferProcessor(); | 77     const GrXferProcessor& xp = *pipeline.getXferProcessor(); | 
| 78     GrRenderTarget* rt = pipeline.getRenderTarget(); | 78     GrRenderTarget* rt = pipeline.getRenderTarget(); | 
| 79 | 79 | 
| 80     GrXferBarrierType barrierType; | 80     GrXferBarrierType barrierType; | 
| 81     if (!xp.willNeedXferBarrier(rt, caps, &barrierType)) { | 81     if (!xp.willNeedXferBarrier(rt, caps, &barrierType)) { | 
| 82         return NULL; | 82         return NULL; | 
| 83     } | 83     } | 
| 84 | 84 | 
| 85     XferBarrier* xb = GrNEW_APPEND_TO_RECORDER(*this->cmdBuffer(), XferBarrier, 
    (rt)); | 85     XferBarrier* xb = GrNEW_APPEND_TO_RECORDER(*this->cmdBuffer(), XferBarrier, 
    (rt)); | 
| 86     xb->fBarrierType = barrierType; | 86     xb->fBarrierType = barrierType; | 
| 87     return xb; | 87     return xb; | 
| 88 } | 88 } | 
| OLD | NEW | 
|---|