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

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

Issue 1307223004: Remove GrStagedProcessor, remove the word Stage as it applies to FPs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix misresolve Created 5 years, 3 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 | « src/gpu/GrClipMaskManager.cpp ('k') | src/gpu/GrOvalRenderer.cpp » ('j') | no next file with comments »
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 #include "GrContext.h" 9 #include "GrContext.h"
10 10
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 tempDrawInfo.fTempSurfaceDesc.fConfig, buffer , 420 tempDrawInfo.fTempSurfaceDesc.fConfig, buffer ,
421 rowBytes)) { 421 rowBytes)) {
422 return false; 422 return false;
423 } 423 }
424 SkMatrix matrix; 424 SkMatrix matrix;
425 matrix.setTranslate(SkIntToScalar(left), SkIntToScalar(top)); 425 matrix.setTranslate(SkIntToScalar(left), SkIntToScalar(top));
426 GrDrawContext* drawContext = this->drawContext(); 426 GrDrawContext* drawContext = this->drawContext();
427 if (!drawContext) { 427 if (!drawContext) {
428 return false; 428 return false;
429 } 429 }
430 paint.addColorProcessor(fp); 430 paint.addColorFragmentProcessor(fp);
431 SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(hei ght)); 431 SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(hei ght));
432 drawContext->drawRect(renderTarget, GrClip::WideOpen(), paint, matri x, rect, NULL); 432 drawContext->drawRect(renderTarget, GrClip::WideOpen(), paint, matri x, rect, NULL);
433 433
434 if (kFlushWrites_PixelOp & pixelOpsFlags) { 434 if (kFlushWrites_PixelOp & pixelOpsFlags) {
435 this->flushSurfaceWrites(surface); 435 this->flushSurfaceWrites(surface);
436 } 436 }
437 } 437 }
438 } 438 }
439 if (!tempTexture) { 439 if (!tempTexture) {
440 if (applyPremulToSrc) { 440 if (applyPremulToSrc) {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 // bother. 525 // bother.
526 temp.reset(NULL); 526 temp.reset(NULL);
527 } 527 }
528 } 528 }
529 if (!fp && temp) { 529 if (!fp && temp) {
530 fp.reset(GrConfigConversionEffect::Create( 530 fp.reset(GrConfigConversionEffect::Create(
531 paint.getProcessorDataManager(), src->asTexture(), tempDrawI nfo.fSwapRAndB, 531 paint.getProcessorDataManager(), src->asTexture(), tempDrawI nfo.fSwapRAndB,
532 GrConfigConversionEffect::kNone_PMConversion, textureMatrix) ); 532 GrConfigConversionEffect::kNone_PMConversion, textureMatrix) );
533 } 533 }
534 if (fp) { 534 if (fp) {
535 paint.addColorProcessor(fp); 535 paint.addColorFragmentProcessor(fp);
536 SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar (height)); 536 SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar (height));
537 GrDrawContext* drawContext = this->drawContext(); 537 GrDrawContext* drawContext = this->drawContext();
538 drawContext->drawRect(temp->asRenderTarget(), GrClip::WideOpen() , paint, 538 drawContext->drawRect(temp->asRenderTarget(), GrClip::WideOpen() , paint,
539 SkMatrix::I(), rect, NULL); 539 SkMatrix::I(), rect, NULL);
540 surfaceToRead.reset(SkRef(temp.get())); 540 surfaceToRead.reset(SkRef(temp.get()));
541 left = 0; 541 left = 0;
542 top = 0; 542 top = 0;
543 didTempDraw = true; 543 didTempDraw = true;
544 } 544 }
545 } 545 }
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 ////////////////////////////////////////////////////////////////////////////// 754 //////////////////////////////////////////////////////////////////////////////
755 755
756 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) { 756 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
757 fGpu->addGpuTraceMarker(marker); 757 fGpu->addGpuTraceMarker(marker);
758 } 758 }
759 759
760 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { 760 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
761 fGpu->removeGpuTraceMarker(marker); 761 fGpu->removeGpuTraceMarker(marker);
762 } 762 }
763 763
OLDNEW
« no previous file with comments | « src/gpu/GrClipMaskManager.cpp ('k') | src/gpu/GrOvalRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698