Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: dm/DM.cpp

Issue 707723005: Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « bench/nanobench.cpp ('k') | dm/DMGpuGMTask.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Main binary for DM. 1 // Main binary for DM.
2 // For a high-level overview, please see dm/README. 2 // For a high-level overview, please see dm/README.
3 3
4 #include "CrashHandler.h" 4 #include "CrashHandler.h"
5 #include "LazyDecodeBitmap.h" 5 #include "LazyDecodeBitmap.h"
6 #include "SkCommonFlags.h" 6 #include "SkCommonFlags.h"
7 #include "SkForceLinking.h" 7 #include "SkForceLinking.h"
8 #include "SkGraphics.h" 8 #include "SkGraphics.h"
9 #include "SkOSFile.h" 9 #include "SkOSFile.h"
10 #include "SkPicture.h" 10 #include "SkPicture.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 DM::TaskRunner* tasks) { 79 DM::TaskRunner* tasks) {
80 #define START(name, type, ...) \ 80 #define START(name, type, ...) \
81 if (lowercase(configs[j]).equals(name)) { \ 81 if (lowercase(configs[j]).equals(name)) { \
82 tasks->add(SkNEW_ARGS(DM::type, (name, reporter, tasks, gms[i], ## __VA_ ARGS__))); \ 82 tasks->add(SkNEW_ARGS(DM::type, (name, reporter, tasks, gms[i], ## __VA_ ARGS__))); \
83 } 83 }
84 for (int i = 0; i < gms.count(); i++) { 84 for (int i = 0; i < gms.count(); i++) {
85 for (int j = 0; j < configs.count(); j++) { 85 for (int j = 0; j < configs.count(); j++) {
86 86
87 START("565", CpuGMTask, kRGB_565_SkColorType); 87 START("565", CpuGMTask, kRGB_565_SkColorType);
88 START("8888", CpuGMTask, kN32_SkColorType); 88 START("8888", CpuGMTask, kN32_SkColorType);
89 START("gpu", GpuGMTask, native, gpuAPI, 0, false); 89 START("gpu", GpuGMTask, native, gpuAPI, 0);
90 START("msaa4", GpuGMTask, native, gpuAPI, 4, false); 90 START("msaa4", GpuGMTask, native, gpuAPI, 4);
91 START("msaa16", GpuGMTask, native, gpuAPI, 16, false); 91 START("msaa16", GpuGMTask, native, gpuAPI, 16);
92 START("nvprmsaa4", GpuGMTask, nvpr, gpuAPI, 4, false); 92 START("nvprmsaa4", GpuGMTask, nvpr, gpuAPI, 4);
93 START("nvprmsaa16", GpuGMTask, nvpr, gpuAPI, 16, false); 93 START("nvprmsaa16", GpuGMTask, nvpr, gpuAPI, 16);
94 START("gpudft", GpuGMTask, native, gpuAPI, 0, true); 94 START("gpunull", GpuGMTask, null, gpuAPI, 0);
95 START("gpunull", GpuGMTask, null, gpuAPI, 0, false); 95 START("gpudebug", GpuGMTask, debug, gpuAPI, 0);
96 START("gpudebug", GpuGMTask, debug, gpuAPI, 0, false);
97 #if SK_ANGLE 96 #if SK_ANGLE
98 START("angle", GpuGMTask, angle, gpuAPI, 0); 97 START("angle", GpuGMTask, angle, gpuAPI, 0);
99 #endif 98 #endif
100 #if SK_MESA 99 #if SK_MESA
101 START("mesa", GpuGMTask, mesa, gpuAPI, 0); 100 START("mesa", GpuGMTask, mesa, gpuAPI, 0);
102 #endif 101 #endif
103 START("pdf", PDFTask, RASTERIZE_PDF_PROC); 102 START("pdf", PDFTask, RASTERIZE_PDF_PROC);
104 } 103 }
105 } 104 }
106 #undef START 105 #undef START
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 report_failures(failures); 243 report_failures(failures);
245 return failures.count() > 0; 244 return failures.count() > 0;
246 } 245 }
247 246
248 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 247 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
249 int main(int argc, char** argv) { 248 int main(int argc, char** argv) {
250 SkCommandLineFlags::Parse(argc, argv); 249 SkCommandLineFlags::Parse(argc, argv);
251 return dm_main(); 250 return dm_main();
252 } 251 }
253 #endif 252 #endif
OLDNEW
« no previous file with comments | « bench/nanobench.cpp ('k') | dm/DMGpuGMTask.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698