| Index: src/gpu/effects/GrBezierEffect.cpp
|
| diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
|
| index 798695d4eced4bdc39484e09dd487521df5334d2..7f39b927c968259f5c06ed0b7d82a67c08b587f7 100644
|
| --- a/src/gpu/effects/GrBezierEffect.cpp
|
| +++ b/src/gpu/effects/GrBezierEffect.cpp
|
| @@ -136,8 +136,6 @@ void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
|
|
|
| switch (fEdgeType) {
|
| case kHairlineAA_GrProcessorEdgeType: {
|
| - SkAssertResult(fragBuilder->enableFeature(
|
| - GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
|
| fragBuilder->codeAppendf("%s = dFdx(%s.xyz);", dklmdx.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s = dFdy(%s.xyz);", dklmdy.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s = 2.0 * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;",
|
| @@ -165,8 +163,6 @@ void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
|
| break;
|
| }
|
| case kFillAA_GrProcessorEdgeType: {
|
| - SkAssertResult(fragBuilder->enableFeature(
|
| - GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
|
| fragBuilder->codeAppendf("%s = dFdx(%s.xyz);", dklmdx.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s = dFdy(%s.xyz);", dklmdy.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s ="
|
| @@ -374,8 +370,6 @@ void GrGLQuadEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
|
|
|
| switch (fEdgeType) {
|
| case kHairlineAA_GrProcessorEdgeType: {
|
| - SkAssertResult(fragBuilder->enableFeature(
|
| - GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
|
| fragBuilder->codeAppendf("vec2 duvdx = dFdx(%s.xy);", v.fsIn());
|
| fragBuilder->codeAppendf("vec2 duvdy = dFdy(%s.xy);", v.fsIn());
|
| fragBuilder->codeAppendf("vec2 gF = vec2(2.0 * %s.x * duvdx.x - duvdx.y,"
|
| @@ -390,8 +384,6 @@ void GrGLQuadEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
|
| break;
|
| }
|
| case kFillAA_GrProcessorEdgeType: {
|
| - SkAssertResult(fragBuilder->enableFeature(
|
| - GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
|
| fragBuilder->codeAppendf("vec2 duvdx = dFdx(%s.xy);", v.fsIn());
|
| fragBuilder->codeAppendf("vec2 duvdy = dFdy(%s.xy);", v.fsIn());
|
| fragBuilder->codeAppendf("vec2 gF = vec2(2.0 * %s.x * duvdx.x - duvdx.y,"
|
| @@ -592,8 +584,6 @@ void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
|
|
|
| switch (fEdgeType) {
|
| case kHairlineAA_GrProcessorEdgeType: {
|
| - SkAssertResult(fragBuilder->enableFeature(
|
| - GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
|
| fragBuilder->codeAppendf("%s = dFdx(%s.xyz);", dklmdx.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s = dFdy(%s.xyz);", dklmdy.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s = 3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;",
|
| @@ -620,8 +610,6 @@ void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
|
| break;
|
| }
|
| case kFillAA_GrProcessorEdgeType: {
|
| - SkAssertResult(fragBuilder->enableFeature(
|
| - GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
|
| fragBuilder->codeAppendf("%s = dFdx(%s.xyz);", dklmdx.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s = dFdy(%s.xyz);", dklmdy.c_str(), v.fsIn());
|
| fragBuilder->codeAppendf("%s ="
|
|
|