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

Side by Side Diff: src/gpu/GrContext.cpp

Issue 607993002: Change GrContext::copyTexture to go through GrDrawTarget (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: response to feedback Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/gpu/SkGrPixelRef.cpp » ('j') | src/gpu/SkGrPixelRef.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "GrContext.h" 10 #include "GrContext.h"
(...skipping 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 if (NULL == target) { 1567 if (NULL == target) {
1568 return; 1568 return;
1569 } 1569 }
1570 target->discard(renderTarget); 1570 target->discard(renderTarget);
1571 } 1571 }
1572 1572
1573 void GrContext::copyTexture(GrTexture* src, GrRenderTarget* dst, const SkIPoint* topLeft) { 1573 void GrContext::copyTexture(GrTexture* src, GrRenderTarget* dst, const SkIPoint* topLeft) {
1574 if (NULL == src || NULL == dst) { 1574 if (NULL == src || NULL == dst) {
1575 return; 1575 return;
1576 } 1576 }
1577 ASSERT_OWNED_RESOURCE(src); 1577 ASSERT_OWNED_RESOURCE(src);
robertphillips 2014/09/29 12:14:23 ASSERT_OWNED_RESOURCE(dst); ?
1578 1578
1579
1580 if (src->hasPendingWrite() || dst->hasPendingIO()) {
1581 this->flush();
1582 }
1583
1584 GrDrawTarget::AutoStateRestore asr(fGpu, GrDrawTarget::kReset_ASRInit);
1585 GrDrawState* drawState = fGpu->drawState();
1586 drawState->setRenderTarget(dst);
1587 SkMatrix sampleM;
1588 sampleM.setIDiv(src->width(), src->height());
1589 SkIRect srcRect = SkIRect::MakeWH(dst->width(), dst->height()); 1579 SkIRect srcRect = SkIRect::MakeWH(dst->width(), dst->height());
1590 if (topLeft) { 1580 if (topLeft) {
1591 srcRect.offset(*topLeft); 1581 srcRect.offset(*topLeft);
1592 } 1582 }
1593 SkIRect srcBounds = SkIRect::MakeWH(src->width(), src->height()); 1583 SkIRect srcBounds = SkIRect::MakeWH(src->width(), src->height());
1594 if (!srcRect.intersect(srcBounds)) { 1584 if (!srcRect.intersect(srcBounds)) {
1595 return; 1585 return;
1596 } 1586 }
1597 sampleM.preTranslate(SkIntToScalar(srcRect.fLeft), SkIntToScalar(srcRect.fTo p)); 1587
1598 drawState->addColorTextureProcessor(src, sampleM); 1588 GrDrawTarget* target = this->prepareToDraw(NULL, BUFFERED_DRAW, NULL, NULL);
1599 SkRect dstR = SkRect::MakeWH(SkIntToScalar(srcRect.width()), SkIntToScalar(s rcRect.height())); 1589 if (NULL == target) {
1600 fGpu->drawSimpleRect(dstR); 1590 return;
1591 }
1592 SkIPoint dstPoint;
1593 dstPoint.setZero();
1594 target->copySurface(dst, src, srcRect, dstPoint);
1601 } 1595 }
1602 1596
1603 bool GrContext::writeRenderTargetPixels(GrRenderTarget* target, 1597 bool GrContext::writeRenderTargetPixels(GrRenderTarget* target,
1604 int left, int top, int width, int height , 1598 int left, int top, int width, int height ,
1605 GrPixelConfig srcConfig, 1599 GrPixelConfig srcConfig,
1606 const void* buffer, 1600 const void* buffer,
1607 size_t rowBytes, 1601 size_t rowBytes,
1608 uint32_t flags) { 1602 uint32_t flags) {
1609 ASSERT_OWNED_RESOURCE(target); 1603 ASSERT_OWNED_RESOURCE(target);
1610 1604
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1944 fResourceCache->printStats(); 1938 fResourceCache->printStats();
1945 } 1939 }
1946 #endif 1940 #endif
1947 1941
1948 #if GR_GPU_STATS 1942 #if GR_GPU_STATS
1949 const GrContext::GPUStats* GrContext::gpuStats() const { 1943 const GrContext::GPUStats* GrContext::gpuStats() const {
1950 return fGpu->gpuStats(); 1944 return fGpu->gpuStats();
1951 } 1945 }
1952 #endif 1946 #endif
1953 1947
OLDNEW
« no previous file with comments | « no previous file | src/gpu/SkGrPixelRef.cpp » ('j') | src/gpu/SkGrPixelRef.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698