diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-08 06:51:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-08 06:51:43 -0700 |
| commit | 8ca93e7c733ab064c8a9e03715ac405ae739cf51 (patch) | |
| tree | 5423fe8631957bf363453c8c5f7ce3e19a6e51e4 /src/effects/SkPerlinNoiseShader.cpp | |
| parent | 2f19b551ac10b96a1a35a147063cd4300d6fe07a (diff) | |
Initial CL to create dummy GrShaderDataManager and thread it through
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1225673007
Diffstat (limited to 'src/effects/SkPerlinNoiseShader.cpp')
| -rw-r--r-- | src/effects/SkPerlinNoiseShader.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 7185b4dafe..237af0e066 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -622,9 +622,11 @@ GrFragmentProcessor* GrPerlinNoiseEffect::TestCreate(SkRandom* random, SkPaint paint; GrColor paintColor; GrFragmentProcessor* effect; + GrPaint grPaint; SkAssertResult(shader->asFragmentProcessor(context, paint, GrTest::TestMatrix(random), NULL, - &paintColor, &effect)); + &paintColor, grPaint.getShaderDataManager(), + &effect)); SkDELETE(shader); @@ -943,7 +945,8 @@ void GrGLPerlinNoise::setData(const GrGLProgramDataManager& pdman, const GrProce bool SkPerlinNoiseShader::asFragmentProcessor(GrContext* context, const SkPaint& paint, const SkMatrix& viewM, const SkMatrix* externalLocalMatrix, - GrColor* paintColor, GrFragmentProcessor** fp) const { + GrColor* paintColor, GrShaderDataManager*, + GrFragmentProcessor** fp) const { SkASSERT(context); *paintColor = SkColor2GrColorJustAlpha(paint.getColor()); @@ -997,7 +1000,7 @@ bool SkPerlinNoiseShader::asFragmentProcessor(GrContext* context, const SkPaint& #else bool SkPerlinNoiseShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, - const SkMatrix*, GrColor*, + const SkMatrix*, GrColor*, GrShaderDataManager*, GrFragmentProcessor**) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; |