src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp - Issue 1313573005: Revert of Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor*

Unified Diff: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

Issue 1313573005: Revert of Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (Closed) Base URL: https://skia.googlesource.com/skia.git@things

Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments

Download patch

Index: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

index c88e75692c609c567a8baf0aa33448e2747cddc6..30f0fdf6a1fae5e369f3fd716f8b658ac7a79461 100644

--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

@@ -183,7 +183,7 @@

* All Two point conical gradient test create functions may occasionally create edge case shaders

-const GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

+GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};

SkScalar radius1 = d->fRandom->nextUScalar1();

SkPoint center2;

@@ -209,9 +209,12 @@

center2, radius2,

colors, stops, colorCount,

tm));

- const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,

- GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager);

- GrAlwaysAssert(fp);

+ SkPaint paint;

+ GrFragmentProcessor* fp;

+ GrColor paintColor;

+ SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,

+ GrTest::TestMatrix(d->fRandom), nullptr,

+ &paintColor, d->fProcDataManager, &fp));

return fp;

}

@@ -462,7 +465,7 @@

* All Two point conical gradient test create functions may occasionally create edge case shaders

-const GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

+GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};

SkScalar radius1 = 0.f;

SkPoint center2;

@@ -485,10 +488,15 @@

center2, radius2,

colors, stops, colorCount,

tm));

- const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,

- GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager);

- GrAlwaysAssert(fp);

- return fp;

+ SkPaint paint;

+ GrFragmentProcessor* effect;

+ GrColor paintColor;

+ GrPaint grPaint;

+ SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,

+ GrTest::TestMatrix(d->fRandom), nullptr,

+ &paintColor, d->fProcDataManager,

+ &effect));

+ return effect;

}

GLFocalOutside2PtConicalEffect::GLFocalOutside2PtConicalEffect(const GrProcessor& processor)

@@ -668,7 +676,7 @@

* All Two point conical gradient test create functions may occasionally create edge case shaders

-const GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

+GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};

SkScalar radius1 = 0.f;

SkPoint center2;

@@ -693,9 +701,12 @@

center2, radius2,

colors, stops, colorCount,

tm));

- const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,

- GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager);

- GrAlwaysAssert(fp);

+ SkPaint paint;

+ GrColor paintColor;

+ GrFragmentProcessor* fp;

+ SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,

+ GrTest::TestMatrix(d->fRandom), nullptr,

+ &paintColor, d->fProcDataManager, &fp));

return fp;

}

@@ -912,7 +923,8 @@

* All Two point conical gradient test create functions may occasionally create edge case shaders

-const GrFragmentProcessor* CircleInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

+GrFragmentProcessor*

+CircleInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};

SkScalar radius1 = d->fRandom->nextUScalar1() + 0.0001f; // make sure radius1 != 0

SkPoint center2;

@@ -936,9 +948,12 @@

center2, radius2,

colors, stops, colorCount,

tm));

- const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,

- GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality, d->fProcDataManager);

- GrAlwaysAssert(fp);

+ SkPaint paint;

+ GrColor paintColor;

+ GrFragmentProcessor* fp;

+ SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,

+ GrTest::TestMatrix(d->fRandom), nullptr,

+ &paintColor, d->fProcDataManager, &fp));

return fp;

}

@@ -1139,7 +1154,7 @@

* All Two point conical gradient test create functions may occasionally create edge case shaders

-const GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

+GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {

SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};

SkScalar radius1 = d->fRandom->nextUScalar1() + 0.0001f; // make sure radius1 != 0

SkPoint center2;

@@ -1164,10 +1179,12 @@

center2, radius2,

colors, stops, colorCount,

tm));

- const GrFragmentProcessor* fp = shader->asFragmentProcessor(

- d->fContext,GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality,

- d->fProcDataManager);

- GrAlwaysAssert(fp);

+ SkPaint paint;

+ GrColor paintColor;

+ GrFragmentProcessor* fp;

+ SkAssertResult(shader->asFragmentProcessor(d->fContext, paint,

+ GrTest::TestMatrix(d->fRandom), nullptr,

+ &paintColor, d->fProcDataManager, &fp));

return fp;

}

« no previous file with comments | « src/effects/gradients/SkTwoPointConicalGradient.cpp ('k') | src/gpu/GrAAConvexPathRenderer.cpp » ('j') | no next file with comments »