aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-07-09 06:28:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-09 06:28:14 -0700
commit9cc1775e7230579ad15345bdcb59fa517c17f870 (patch)
tree9e555bccd9ec1161fe61f33d44ae77bba7ef6544 /tests
parent426388eeb7fd5cb9226fb1d2067c04f3aba8d094 (diff)
rename GrShaderDataManager -> GrProcessorDataManager
Diffstat (limited to 'tests')
-rw-r--r--tests/GLProgramsTest.cpp4
-rw-r--r--tests/GpuColorFilterTest.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 3feb9692b3..7eb5315166 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -244,8 +244,8 @@ bool GrDrawTarget::programUnitTest(GrContext* context, int maxStages) {
SkAutoTUnref<GrBatch> batch(GrRandomBatch(&random, context));
SkASSERT(batch);
- GrShaderDataManager shaderDataManager;
- GrProcessorTestData ptd(&random, context, &shaderDataManager, fGpu->caps(), dummyTextures);
+ GrProcessorDataManager procDataManager;
+ GrProcessorTestData ptd(&random, context, &procDataManager, fGpu->caps(), dummyTextures);
set_random_color_coverage_stages(&pipelineBuilder, &ptd, maxStages);
set_random_xpf(&pipelineBuilder, &ptd);
set_random_state(&pipelineBuilder, &random);
diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp
index 3d7f89ed53..0c4cf234bf 100644
--- a/tests/GpuColorFilterTest.cpp
+++ b/tests/GpuColorFilterTest.cpp
@@ -102,7 +102,7 @@ static void test_getConstantColorComponents(skiatest::Reporter* reporter, GrCont
const GetConstantComponentTestCase& test = filterTests[i];
SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(test.filterColor, test.filterMode));
SkTDArray<GrFragmentProcessor*> array;
- bool hasFrag = cf->asFragmentProcessors(grContext, paint.getShaderDataManager(), &array);
+ bool hasFrag = cf->asFragmentProcessors(grContext, paint.getProcessorDataManager(), &array);
REPORTER_ASSERT(reporter, hasFrag);
REPORTER_ASSERT(reporter, 1 == array.count());
GrInvariantOutput inout(test.inputColor,