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

Side by Side Diff: src/effects/SkDisplacementMapEffect.cpp

Issue 1457543003: Add ShaderBuilders to EmitArgs and remove gettings from ProgBuilder. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month 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/effects/SkColorMatrixFilter.cpp ('k') | src/effects/SkLightingImageFilter.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 * Copyright 2013 Google Inc. 2 * Copyright 2013 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 "SkDisplacementMapEffect.h" 8 #include "SkDisplacementMapEffect.h"
9 #include "SkDevice.h" 9 #include "SkDevice.h"
10 #include "SkReadBuffer.h" 10 #include "SkReadBuffer.h"
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 550
551 fScaleUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibi lity, 551 fScaleUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibi lity,
552 kVec2f_GrSLType, kDefault_GrSLPrecisio n, "Scale"); 552 kVec2f_GrSLType, kDefault_GrSLPrecisio n, "Scale");
553 const char* scaleUni = args.fBuilder->getUniformCStr(fScaleUni); 553 const char* scaleUni = args.fBuilder->getUniformCStr(fScaleUni);
554 const char* dColor = "dColor"; 554 const char* dColor = "dColor";
555 const char* cCoords = "cCoords"; 555 const char* cCoords = "cCoords";
556 const char* nearZero = "1e-6"; // Since 6.10352e−5 is the smallest half floa t, use 556 const char* nearZero = "1e-6"; // Since 6.10352e−5 is the smallest half floa t, use
557 // a number smaller than that to approximate 0, but 557 // a number smaller than that to approximate 0, but
558 // leave room for 32-bit float GPU rounding e rrors. 558 // leave room for 32-bit float GPU rounding e rrors.
559 559
560 GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder() ; 560 GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
561 fsBuilder->codeAppendf("\t\tvec4 %s = ", dColor); 561 fragBuilder->codeAppendf("\t\tvec4 %s = ", dColor);
562 fsBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(), 562 fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
563 args.fCoords[0].getType()); 563 args.fCoords[0].getType());
564 fsBuilder->codeAppend(";\n"); 564 fragBuilder->codeAppend(";\n");
565 565
566 // Unpremultiply the displacement 566 // Unpremultiply the displacement
567 fsBuilder->codeAppendf("\t\t%s.rgb = (%s.a < %s) ? vec3(0.0) : clamp(%s.rgb / %s.a, 0.0, 1.0);", 567 fragBuilder->codeAppendf(
568 dColor, dColor, nearZero, dColor, dColor); 568 "\t\t%s.rgb = (%s.a < %s) ? vec3(0.0) : clamp(%s.rgb / %s.a, 0.0, 1.0);" ,
569 SkString coords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 1); 569 dColor, dColor, nearZero, dColor, dColor);
570 fsBuilder->codeAppendf("\t\tvec2 %s = %s + %s*(%s.", 570 SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 1);
571 cCoords, coords2D.c_str(), scaleUni, dColor); 571 fragBuilder->codeAppendf("\t\tvec2 %s = %s + %s*(%s.",
572 cCoords, coords2D.c_str(), scaleUni, dColor);
572 573
573 switch (fXChannelSelector) { 574 switch (fXChannelSelector) {
574 case SkDisplacementMapEffect::kR_ChannelSelectorType: 575 case SkDisplacementMapEffect::kR_ChannelSelectorType:
575 fsBuilder->codeAppend("r"); 576 fragBuilder->codeAppend("r");
576 break; 577 break;
577 case SkDisplacementMapEffect::kG_ChannelSelectorType: 578 case SkDisplacementMapEffect::kG_ChannelSelectorType:
578 fsBuilder->codeAppend("g"); 579 fragBuilder->codeAppend("g");
579 break; 580 break;
580 case SkDisplacementMapEffect::kB_ChannelSelectorType: 581 case SkDisplacementMapEffect::kB_ChannelSelectorType:
581 fsBuilder->codeAppend("b"); 582 fragBuilder->codeAppend("b");
582 break; 583 break;
583 case SkDisplacementMapEffect::kA_ChannelSelectorType: 584 case SkDisplacementMapEffect::kA_ChannelSelectorType:
584 fsBuilder->codeAppend("a"); 585 fragBuilder->codeAppend("a");
585 break; 586 break;
586 case SkDisplacementMapEffect::kUnknown_ChannelSelectorType: 587 case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
587 default: 588 default:
588 SkDEBUGFAIL("Unknown X channel selector"); 589 SkDEBUGFAIL("Unknown X channel selector");
589 } 590 }
590 591
591 switch (fYChannelSelector) { 592 switch (fYChannelSelector) {
592 case SkDisplacementMapEffect::kR_ChannelSelectorType: 593 case SkDisplacementMapEffect::kR_ChannelSelectorType:
593 fsBuilder->codeAppend("r"); 594 fragBuilder->codeAppend("r");
594 break; 595 break;
595 case SkDisplacementMapEffect::kG_ChannelSelectorType: 596 case SkDisplacementMapEffect::kG_ChannelSelectorType:
596 fsBuilder->codeAppend("g"); 597 fragBuilder->codeAppend("g");
597 break; 598 break;
598 case SkDisplacementMapEffect::kB_ChannelSelectorType: 599 case SkDisplacementMapEffect::kB_ChannelSelectorType:
599 fsBuilder->codeAppend("b"); 600 fragBuilder->codeAppend("b");
600 break; 601 break;
601 case SkDisplacementMapEffect::kA_ChannelSelectorType: 602 case SkDisplacementMapEffect::kA_ChannelSelectorType:
602 fsBuilder->codeAppend("a"); 603 fragBuilder->codeAppend("a");
603 break; 604 break;
604 case SkDisplacementMapEffect::kUnknown_ChannelSelectorType: 605 case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
605 default: 606 default:
606 SkDEBUGFAIL("Unknown Y channel selector"); 607 SkDEBUGFAIL("Unknown Y channel selector");
607 } 608 }
608 fsBuilder->codeAppend("-vec2(0.5));\t\t"); 609 fragBuilder->codeAppend("-vec2(0.5));\t\t");
609 610
610 fGLDomain.sampleTexture(fsBuilder, domain, args.fOutputColor, SkString(cCoor ds), 611 fGLDomain.sampleTexture(fragBuilder, domain, args.fOutputColor, SkString(cCo ords),
611 args.fSamplers[1]); 612 args.fSamplers[1]);
612 fsBuilder->codeAppend(";\n"); 613 fragBuilder->codeAppend(";\n");
613 } 614 }
614 615
615 void GrGLDisplacementMapEffect::onSetData(const GrGLSLProgramDataManager& pdman, 616 void GrGLDisplacementMapEffect::onSetData(const GrGLSLProgramDataManager& pdman,
616 const GrProcessor& proc) { 617 const GrProcessor& proc) {
617 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>(); 618 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>();
618 GrTexture* colorTex = displacementMap.texture(1); 619 GrTexture* colorTex = displacementMap.texture(1);
619 SkScalar scaleX = displacementMap.scale().fX / colorTex->width(); 620 SkScalar scaleX = displacementMap.scale().fX / colorTex->width();
620 SkScalar scaleY = displacementMap.scale().fY / colorTex->height(); 621 SkScalar scaleY = displacementMap.scale().fY / colorTex->height();
621 pdman.set2f(fScaleUni, SkScalarToFloat(scaleX), 622 pdman.set2f(fScaleUni, SkScalarToFloat(scaleX),
622 colorTex->origin() == kTopLeft_GrSurfaceOrigin ? 623 colorTex->origin() == kTopLeft_GrSurfaceOrigin ?
623 SkScalarToFloat(scaleY) : SkScalarToFloat(-scaleY)); 624 SkScalarToFloat(scaleY) : SkScalarToFloat(-scaleY));
624 fGLDomain.setData(pdman, displacementMap.domain(), colorTex->origin()); 625 fGLDomain.setData(pdman, displacementMap.domain(), colorTex->origin());
625 } 626 }
626 627
627 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc, 628 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc,
628 const GrGLSLCaps&, GrProcessorKeyBuilder* b) { 629 const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
629 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>(); 630 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>();
630 631
631 uint32_t xKey = displacementMap.xChannelSelector(); 632 uint32_t xKey = displacementMap.xChannelSelector();
632 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s; 633 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s;
633 634
634 b->add32(xKey | yKey); 635 b->add32(xKey | yKey);
635 } 636 }
636 #endif 637 #endif
637 638
OLDNEW
« no previous file with comments | « src/effects/SkColorMatrixFilter.cpp ('k') | src/effects/SkLightingImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698