OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "CrashHandler.h" | 8 #include "CrashHandler.h" |
9 #include "DMJsonWriter.h" | 9 #include "DMJsonWriter.h" |
10 #include "DMSrcSink.h" | 10 #include "DMSrcSink.h" |
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1431 continue; | 1431 continue; |
1432 } | 1432 } |
1433 // Use "native" instead of explicitly trying OpenGL and OpenGL ES. Do no
t use GLES on, | 1433 // Use "native" instead of explicitly trying OpenGL and OpenGL ES. Do no
t use GLES on, |
1434 // desktop since tests do not account for not fixing http://skbug.com/28
09 | 1434 // desktop since tests do not account for not fixing http://skbug.com/28
09 |
1435 if (contextType == GrContextFactory::kGL_ContextType || | 1435 if (contextType == GrContextFactory::kGL_ContextType || |
1436 contextType == GrContextFactory::kGLES_ContextType) { | 1436 contextType == GrContextFactory::kGLES_ContextType) { |
1437 if (contextType != GrContextFactory::kNativeGL_ContextType) { | 1437 if (contextType != GrContextFactory::kNativeGL_ContextType) { |
1438 continue; | 1438 continue; |
1439 } | 1439 } |
1440 } | 1440 } |
1441 if (ctxInfo.fGrContext) { | 1441 if (ctxInfo.grContext()) { |
1442 (*test)(reporter, ctxInfo); | 1442 (*test)(reporter, ctxInfo); |
1443 } | 1443 } |
1444 ctxInfo = factory->getContextInfo(contextType, | 1444 ctxInfo = factory->getContextInfo(contextType, |
1445 GrContextFactory::kEnableNVPR_ContextO
ptions); | 1445 GrContextFactory::kEnableNVPR_ContextO
ptions); |
1446 if (ctxInfo.fGrContext) { | 1446 if (ctxInfo.grContext()) { |
1447 (*test)(reporter, ctxInfo); | 1447 (*test)(reporter, ctxInfo); |
1448 } | 1448 } |
1449 } | 1449 } |
1450 #endif | 1450 #endif |
1451 } | 1451 } |
1452 } // namespace skiatest | 1452 } // namespace skiatest |
1453 | 1453 |
1454 #if !defined(SK_BUILD_FOR_IOS) | 1454 #if !defined(SK_BUILD_FOR_IOS) |
1455 int main(int argc, char** argv) { | 1455 int main(int argc, char** argv) { |
1456 SkCommandLineFlags::Parse(argc, argv); | 1456 SkCommandLineFlags::Parse(argc, argv); |
1457 return dm_main(); | 1457 return dm_main(); |
1458 } | 1458 } |
1459 #endif | 1459 #endif |
OLD | NEW |