diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-03 18:49:51 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-03 18:49:51 +0000 |
| commit | 8d3d210e74e3058f28eb2e59b71cae717ed65996 (patch) | |
| tree | 5561d157901392320c51c5b012d8907766a9a834 /src/gpu/effects/GrConvolutionEffect.cpp | |
| parent | 5c33b71b96572a752aba29d3e43b8ecac8019a1d (diff) | |
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
Diffstat (limited to 'src/gpu/effects/GrConvolutionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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]; |