aboutsummaryrefslogtreecommitdiff
path: root/tests/GLProgramsTest.cpp
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-25 21:42:05 +0000
committerbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-25 21:42:05 +0000
commit46fba0d79335f17429bb71d87a04d93fb2ee992b (patch)
treeba0a11312408578eeea662a47f249a6248081e74 /tests/GLProgramsTest.cpp
parent0e363109199198e21237fa4e8314094917e62640 (diff)
Rename StageKey and related stuff.
R=robertphillips@google.com Review URL: https://codereview.appspot.com/6785049 git-svn-id: http://skia.googlecode.com/svn/trunk@6130 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/GLProgramsTest.cpp')
-rw-r--r--tests/GLProgramsTest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index b95a0bf058..e6b2f56d5b 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -136,7 +136,7 @@ bool GrGpuGL::programUnitTest() {
pdesc.fVertexLayout |= kTextFormat_VertexLayoutBit;
}
- stage.fCustomStageKey = 0;
+ stage.fEffectKey = 0;
stage.fOptFlags |= STAGE_OPTS[random_int(&random, GR_ARRAY_COUNT(STAGE_OPTS))];
@@ -147,8 +147,8 @@ bool GrGpuGL::programUnitTest() {
getContext(),
dummyTextures));
if (NULL != effects[s]) {
- stage.fCustomStageKey =
- effects[s]->getFactory().glStageKey(*effects[s], this->glCaps());
+ stage.fEffectKey =
+ effects[s]->getFactory().glEffectKey(*effects[s], this->glCaps());
}
}
}