Reland r6233 with fix.
git-svn-id: http://skia.googlecode.com/svn/trunk@6241 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 9c001fb..fccdd65 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -184,7 +184,12 @@
void forceLinking() {
SkLightingImageFilter::CreateDistantLitDiffuse(SkPoint3(0,0,0), 0, 0, 0);
SkMagnifierImageFilter mag(SkRect::MakeWH(SK_Scalar1, SK_Scalar1), SK_Scalar1);
- GrConfigConversionEffect::Create(NULL, false);
+ GrEffectStage dummyStage;
+ GrConfigConversionEffect::InstallEffect(NULL,
+ false,
+ GrConfigConversionEffect::kNone_PMConversion,
+ GrMatrix::I(),
+ &dummyStage);
SkScalar matrix[20];
SkColorMatrixFilter cmf(matrix);
}