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 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1218 // http://skbug.com/2809 | 1218 // http://skbug.com/2809 |
1219 GrContextFactory::GLContextType contextTypes[] = { | 1219 GrContextFactory::GLContextType contextTypes[] = { |
1220 GrContextFactory::kNative_GLContextType, | 1220 GrContextFactory::kNative_GLContextType, |
1221 #if SK_ANGLE | 1221 #if SK_ANGLE |
1222 #ifdef SK_BUILD_FOR_WIN | 1222 #ifdef SK_BUILD_FOR_WIN |
1223 GrContextFactory::kANGLE_GLContextType, | 1223 GrContextFactory::kANGLE_GLContextType, |
1224 #endif | 1224 #endif |
1225 GrContextFactory::kANGLE_GL_GLContextType, | 1225 GrContextFactory::kANGLE_GL_GLContextType, |
1226 #endif | 1226 #endif |
1227 #if SK_COMMAND_BUFFER | 1227 #if SK_COMMAND_BUFFER |
1228 GrContextFactory::kCommandBuffer_GLContextType, | 1228 GrContextFactory::kCommandBufferES2_GLContextType, |
| 1229 GrContextFactory::kCommandBufferES3_GLContextType, |
1229 #endif | 1230 #endif |
1230 #if SK_MESA | 1231 #if SK_MESA |
1231 GrContextFactory::kMESA_GLContextType, | 1232 GrContextFactory::kMESA_GLContextType, |
1232 #endif | 1233 #endif |
1233 GrContextFactory::kNull_GLContextType, | 1234 GrContextFactory::kNull_GLContextType, |
1234 GrContextFactory::kDebug_GLContextType, | 1235 GrContextFactory::kDebug_GLContextType, |
1235 }; | 1236 }; |
1236 static_assert(SK_ARRAY_COUNT(contextTypes) == GrContextFactory::kGLContextTy
peCnt - 2, | 1237 static_assert(SK_ARRAY_COUNT(contextTypes) == GrContextFactory::kGLContextTy
peCnt - 2, |
1237 "Skipping unexpected GLContextType for GPU tests"); | 1238 "Skipping unexpected GLContextType for GPU tests"); |
1238 | 1239 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 Reporter* reporter, | 1275 Reporter* reporter, |
1275 GrContextFactory* fac
tory); | 1276 GrContextFactory* fac
tory); |
1276 } // namespace skiatest | 1277 } // namespace skiatest |
1277 | 1278 |
1278 #if !defined(SK_BUILD_FOR_IOS) | 1279 #if !defined(SK_BUILD_FOR_IOS) |
1279 int main(int argc, char** argv) { | 1280 int main(int argc, char** argv) { |
1280 SkCommandLineFlags::Parse(argc, argv); | 1281 SkCommandLineFlags::Parse(argc, argv); |
1281 return dm_main(); | 1282 return dm_main(); |
1282 } | 1283 } |
1283 #endif | 1284 #endif |
OLD | NEW |