| OLD | NEW |
| 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 "SkDither.h" | 8 #include "SkDither.h" |
| 9 #include "SkPerlinNoiseShader2.h" | 9 #include "SkPerlinNoiseShader2.h" |
| 10 #include "SkColorFilter.h" | 10 #include "SkColorFilter.h" |
| (...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 return shader->asFragmentProcessor(SkShader::AsFPArgs(d->fContext, &viewMatr
ix, nullptr, | 732 return shader->asFragmentProcessor(SkShader::AsFPArgs(d->fContext, &viewMatr
ix, nullptr, |
| 733 kNone_SkFilterQuality,
nullptr, | 733 kNone_SkFilterQuality,
nullptr, |
| 734 SkSourceGammaTreatment
::kRespect)); | 734 SkSourceGammaTreatment
::kRespect)); |
| 735 } | 735 } |
| 736 | 736 |
| 737 void GrGLPerlinNoise2::emitCode(EmitArgs& args) { | 737 void GrGLPerlinNoise2::emitCode(EmitArgs& args) { |
| 738 const GrPerlinNoise2Effect& pne = args.fFp.cast<GrPerlinNoise2Effect>(); | 738 const GrPerlinNoise2Effect& pne = args.fFp.cast<GrPerlinNoise2Effect>(); |
| 739 | 739 |
| 740 GrGLSLFragmentBuilder* fsBuilder = args.fFragBuilder; | 740 GrGLSLFragmentBuilder* fsBuilder = args.fFragBuilder; |
| 741 GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; | 741 GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; |
| 742 SkString vCoords = fsBuilder->ensureFSCoords2D(args.fCoords, 0); | 742 SkString vCoords = fsBuilder->ensureCoords2D(args.fTransformedCoords[0]); |
| 743 | 743 |
| 744 fBaseFrequencyUni = uniformHandler->addUniform(kFragment_GrShaderFlag, | 744 fBaseFrequencyUni = uniformHandler->addUniform(kFragment_GrShaderFlag, |
| 745 kVec2f_GrSLType, kDefault_GrS
LPrecision, | 745 kVec2f_GrSLType, kDefault_GrS
LPrecision, |
| 746 "baseFrequency"); | 746 "baseFrequency"); |
| 747 const char* baseFrequencyUni = uniformHandler->getUniformCStr(fBaseFrequency
Uni); | 747 const char* baseFrequencyUni = uniformHandler->getUniformCStr(fBaseFrequency
Uni); |
| 748 | 748 |
| 749 const char* stitchDataUni = nullptr; | 749 const char* stitchDataUni = nullptr; |
| 750 if (pne.stitchTiles()) { | 750 if (pne.stitchTiles()) { |
| 751 fStitchDataUni = uniformHandler->addUniform(kFragment_GrShaderFlag, | 751 fStitchDataUni = uniformHandler->addUniform(kFragment_GrShaderFlag, |
| 752 kVec2f_GrSLType, kDefault_Gr
SLPrecision, | 752 kVec2f_GrSLType, kDefault_Gr
SLPrecision, |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1138 GrPaint grPaint; | 1138 GrPaint grPaint; |
| 1139 SkMatrix viewMatrix = GrTest::TestMatrix(d->fRandom); | 1139 SkMatrix viewMatrix = GrTest::TestMatrix(d->fRandom); |
| 1140 return shader->asFragmentProcessor(SkShader::AsFPArgs(d->fContext, &viewMatr
ix, nullptr, | 1140 return shader->asFragmentProcessor(SkShader::AsFPArgs(d->fContext, &viewMatr
ix, nullptr, |
| 1141 kNone_SkFilterQuality,
nullptr, | 1141 kNone_SkFilterQuality,
nullptr, |
| 1142 SkSourceGammaTreatment
::kRespect)); | 1142 SkSourceGammaTreatment
::kRespect)); |
| 1143 } | 1143 } |
| 1144 | 1144 |
| 1145 void GrGLImprovedPerlinNoise::emitCode(EmitArgs& args) { | 1145 void GrGLImprovedPerlinNoise::emitCode(EmitArgs& args) { |
| 1146 GrGLSLFragmentBuilder* fsBuilder = args.fFragBuilder; | 1146 GrGLSLFragmentBuilder* fsBuilder = args.fFragBuilder; |
| 1147 GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; | 1147 GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; |
| 1148 SkString vCoords = fsBuilder->ensureFSCoords2D(args.fCoords, 0); | 1148 SkString vCoords = fsBuilder->ensureCoords2D(args.fTransformedCoords[0]); |
| 1149 | 1149 |
| 1150 fBaseFrequencyUni = uniformHandler->addUniform(kFragment_GrShaderFlag, | 1150 fBaseFrequencyUni = uniformHandler->addUniform(kFragment_GrShaderFlag, |
| 1151 kVec2f_GrSLType, kDefault_GrS
LPrecision, | 1151 kVec2f_GrSLType, kDefault_GrS
LPrecision, |
| 1152 "baseFrequency"); | 1152 "baseFrequency"); |
| 1153 const char* baseFrequencyUni = uniformHandler->getUniformCStr(fBaseFrequency
Uni); | 1153 const char* baseFrequencyUni = uniformHandler->getUniformCStr(fBaseFrequency
Uni); |
| 1154 | 1154 |
| 1155 fOctavesUni = uniformHandler->addUniform(kFragment_GrShaderFlag, | 1155 fOctavesUni = uniformHandler->addUniform(kFragment_GrShaderFlag, |
| 1156 kFloat_GrSLType, kDefault_GrSLPreci
sion, | 1156 kFloat_GrSLType, kDefault_GrSLPreci
sion, |
| 1157 "octaves"); | 1157 "octaves"); |
| 1158 const char* octavesUni = uniformHandler->getUniformCStr(fOctavesUni); | 1158 const char* octavesUni = uniformHandler->getUniformCStr(fOctavesUni); |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1397 str->append(" seed: "); | 1397 str->append(" seed: "); |
| 1398 str->appendScalar(fSeed); | 1398 str->appendScalar(fSeed); |
| 1399 str->append(" stitch tiles: "); | 1399 str->append(" stitch tiles: "); |
| 1400 str->append(fStitchTiles ? "true " : "false "); | 1400 str->append(fStitchTiles ? "true " : "false "); |
| 1401 | 1401 |
| 1402 this->INHERITED::toString(str); | 1402 this->INHERITED::toString(str); |
| 1403 | 1403 |
| 1404 str->append(")"); | 1404 str->append(")"); |
| 1405 } | 1405 } |
| 1406 #endif | 1406 #endif |
| OLD | NEW |