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