Index: tests/GLProgramsTest.cpp |
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp |
index 9da1ecc53c0a798fdb9762c1b7376bdc7c088e2d..14de47346f4b0ecc10c38b0a6e7146e4d956d693 100644 |
--- a/tests/GLProgramsTest.cpp |
+++ b/tests/GLProgramsTest.cpp |
@@ -16,8 +16,8 @@ |
#include "GrContextFactory.h" |
#include "GrDrawEffect.h" |
#include "effects/GrConfigConversionEffect.h" |
+#include "gl/GrGLPathRendering.h" |
#include "gl/GrGpuGL.h" |
- |
#include "SkChecksum.h" |
#include "SkRandom.h" |
#include "Test.h" |
@@ -178,7 +178,8 @@ bool GrGpuGL::programUnitTest(int maxStages) { |
SkAutoSTMalloc<8, const GrEffectStage*> stages(numStages); |
- bool useFixedFunctionTexturing = this->shouldUseFixedFunctionTexturing(); |
+ bool useFixedFunctionPathRendering = this->glCaps().pathRenderingSupport() && |
+ !this->pathRendering()->caps().fragmentInputGenSupport; |
for (int s = 0; s < numStages;) { |
SkAutoTUnref<const GrEffect> effect(GrEffectTestFactory::CreateStage( |
@@ -198,7 +199,7 @@ bool GrGpuGL::programUnitTest(int maxStages) { |
// If adding this effect would exceed the max texture coord set count then generate a |
// new random effect. |
- if (useFixedFunctionTexturing && !effect->hasVertexCode()) { |
+ if (useFixedFunctionPathRendering && !effect->hasVertexCode()) { |
int numTransforms = effect->numTransforms(); |
if (currTextureCoordSet + numTransforms > this->glCaps().maxFixedFunctionTextureCoords()) { |
continue; |
@@ -206,7 +207,7 @@ bool GrGpuGL::programUnitTest(int maxStages) { |
currTextureCoordSet += numTransforms; |
} |
- useFixedFunctionTexturing = useFixedFunctionTexturing && !effect->hasVertexCode(); |
+ useFixedFunctionPathRendering = useFixedFunctionPathRendering && !effect->hasVertexCode(); |
for (int i = 0; i < numAttribs; ++i) { |
attribIndices[i] = currAttribIndex++; |