From 8d3d210e74e3058f28eb2e59b71cae717ed65996 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 3 Aug 2012 18:49:51 +0000 Subject: Ensure that enums used by GrCustomStage TestCreate functions are declared in SK_ALLOW_GLOBAL_STATIC_INITIALIZERS=0 builds (e.g. android) git-svn-id: http://skia.googlecode.com/svn/trunk@4953 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/effects/GrConvolutionEffect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu/effects/GrConvolutionEffect.cpp') diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 2d705fa219..92c6ffb169 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -187,8 +187,8 @@ GR_DEFINE_CUSTOM_STAGE_TEST(GrConvolutionEffect); GrCustomStage* GrConvolutionEffect::TestCreate(SkRandom* random, GrContext* context, GrTexture* textures[]) { - int texIdx = random->nextBool() ? GrCustomStageTestFactory::kSkiaPMTextureIdx : - GrCustomStageTestFactory::kAlphaTextureIdx; + int texIdx = random->nextBool() ? GrCustomStageUnitTest::kSkiaPMTextureIdx : + GrCustomStageUnitTest::kAlphaTextureIdx; Direction dir = random->nextBool() ? kX_Direction : kY_Direction; int radius = random->nextRangeU(1, kMaxKernelRadius); float kernel[kMaxKernelRadius]; -- cgit v1.2.3