| Index: dm/DM.cpp
|
| diff --git a/dm/DM.cpp b/dm/DM.cpp
|
| index 34f8a961e3f4c503182c95e49e2efad9bfaa2d40..363f9f078c2b1313ad6f280dd2986065e7da4a6c 100644
|
| --- a/dm/DM.cpp
|
| +++ b/dm/DM.cpp
|
| @@ -70,6 +70,8 @@ DEFINE_int32(shard, 0, "Which shard do I run?");
|
| DEFINE_bool(simpleCodec, false, "Only decode images to native scale");
|
|
|
| using namespace DM;
|
| +using sk_gpu_test::GrContextFactory;
|
| +using sk_gpu_test::GLContext;
|
|
|
| /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
|
|
|
| @@ -1411,7 +1413,7 @@ int dm_main() {
|
| namespace skiatest {
|
| namespace {
|
| typedef void(*TestWithGrContext)(skiatest::Reporter*, GrContext*);
|
| -typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, SkGLContext*);
|
| +typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, GLContext*);
|
| #if SK_SUPPORT_GPU
|
| template<typename T>
|
| void call_test(T test, skiatest::Reporter* reporter, const GrContextFactory::ContextInfo& context);
|
|
|