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

Side by Side Diff: tools/skpdiff/skpdiff_main.cpp

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 8 months 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 | « tools/CrashHandler.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // TODO(djsollen): Rename this whole package (perhaps to "SkMultiDiffer"). 8 // TODO(djsollen): Rename this whole package (perhaps to "SkMultiDiffer").
9 // It's not just for "pdiff" (perceptual diffs)--it's a harness that allows 9 // It's not just for "pdiff" (perceptual diffs)--it's a harness that allows
10 // the execution of an arbitrary set of difference algorithms. 10 // the execution of an arbitrary set of difference algorithms.
11 // See http://skbug.com/2711 ('rename skpdiff') 11 // See http://skbug.com/2711 ('rename skpdiff')
12 12
13 #include "SkTypes.h"
14
13 #if SK_SUPPORT_OPENCL 15 #if SK_SUPPORT_OPENCL
14 16
15 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr 17 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr
16 #define __NO_STD_STRING // Uses cl::STRING_CLASS instead of std::string 18 #define __NO_STD_STRING // Uses cl::STRING_CLASS instead of std::string
17 #if defined(SK_BUILD_FOR_MAC) 19 #if defined(SK_BUILD_FOR_MAC)
18 // Note that some macs don't have this header and it can be downloaded from the Khronos registry 20 // Note that some macs don't have this header and it can be downloaded from the Khronos registry
19 # include <OpenCL/cl.hpp> 21 # include <OpenCL/cl.hpp>
20 #else 22 #else
21 # include <CL/cl.hpp> 23 # include <CL/cl.hpp>
22 #endif 24 #endif
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 } 254 }
253 255
254 if (!FLAGS_csv.isEmpty()) { 256 if (!FLAGS_csv.isEmpty()) {
255 SkFILEWStream outputStream(FLAGS_csv[0]); 257 SkFILEWStream outputStream(FLAGS_csv[0]);
256 ctx.outputCsv(outputStream); 258 ctx.outputCsv(outputStream);
257 } 259 }
258 260
259 return 0; 261 return 0;
260 } 262 }
261 263
262 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 264 #if !defined(SK_BUILD_FOR_IOS)
263 int main(int argc, char * argv[]) { 265 int main(int argc, char * argv[]) {
264 return tool_main(argc, (char**) argv); 266 return tool_main(argc, (char**) argv);
265 } 267 }
266 #endif 268 #endif
OLDNEW
« no previous file with comments | « tools/CrashHandler.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698