OLD | NEW |
---|---|
1 #include "CrashHandler.h" | 1 #include "CrashHandler.h" |
2 #include "DMJsonWriter.h" | 2 #include "DMJsonWriter.h" |
3 #include "DMSrcSink.h" | 3 #include "DMSrcSink.h" |
4 #include "OverwriteLine.h" | 4 #include "OverwriteLine.h" |
5 #include "ProcStats.h" | 5 #include "ProcStats.h" |
6 #include "SkBBHFactory.h" | 6 #include "SkBBHFactory.h" |
7 #include "SkChecksum.h" | 7 #include "SkChecksum.h" |
8 #include "SkCommonFlags.h" | 8 #include "SkCommonFlags.h" |
9 #include "SkForceLinking.h" | 9 #include "SkForceLinking.h" |
10 #include "SkGraphics.h" | 10 #include "SkGraphics.h" |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
197 SINK("nvprmsaa4", GPUSink, Gr::kNVPR_GLContextType, api, 4, false, F LAGS_gpu_threading); | 197 SINK("nvprmsaa4", GPUSink, Gr::kNVPR_GLContextType, api, 4, false, F LAGS_gpu_threading); |
198 SINK("nvprmsaa16", GPUSink, Gr::kNVPR_GLContextType, api, 16, false, F LAGS_gpu_threading); | 198 SINK("nvprmsaa16", GPUSink, Gr::kNVPR_GLContextType, api, 16, false, F LAGS_gpu_threading); |
199 #if SK_ANGLE | 199 #if SK_ANGLE |
200 SINK("angle", GPUSink, Gr::kANGLE_GLContextType, api, 0, false, F LAGS_gpu_threading); | 200 SINK("angle", GPUSink, Gr::kANGLE_GLContextType, api, 0, false, F LAGS_gpu_threading); |
201 #endif | 201 #endif |
202 #if SK_MESA | 202 #if SK_MESA |
203 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0, false, F LAGS_gpu_threading); | 203 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0, false, F LAGS_gpu_threading); |
204 #endif | 204 #endif |
205 } | 205 } |
206 | 206 |
207 SINK("null", NullSink); | |
mtklein
2015/01/29 20:00:12
Let's put this under if (FLAGS_cpu) { ... }.
hal.canary
2015/01/30 18:43:24
Done.
| |
208 | |
207 if (FLAGS_cpu) { | 209 if (FLAGS_cpu) { |
208 SINK("565", RasterSink, kRGB_565_SkColorType); | 210 SINK("565", RasterSink, kRGB_565_SkColorType); |
209 SINK("8888", RasterSink, kN32_SkColorType); | 211 SINK("8888", RasterSink, kN32_SkColorType); |
210 SINK("pdf", PDFSink); | 212 SINK("pdf", PDFSink); |
211 SINK("skp", SKPSink); | 213 SINK("skp", SKPSink); |
212 } | 214 } |
213 #undef SINK | 215 #undef SINK |
214 return NULL; | 216 return NULL; |
215 } | 217 } |
216 | 218 |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
530 } | 532 } |
531 return 0; | 533 return 0; |
532 } | 534 } |
533 | 535 |
534 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 536 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
535 int main(int argc, char** argv) { | 537 int main(int argc, char** argv) { |
536 SkCommandLineFlags::Parse(argc, argv); | 538 SkCommandLineFlags::Parse(argc, argv); |
537 return dm_main(); | 539 return dm_main(); |
538 } | 540 } |
539 #endif | 541 #endif |
OLD | NEW |