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

Side by Side Diff: bench/benchmain.cpp

Issue 76213004: fix bench so that if SK_SUPPORTS_GPU even when not provided as compiler option (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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
2 /* 1 /*
3 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
4 * 3 *
5 * 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
6 * found in the LICENSE file. 5 * found in the LICENSE file.
7 */ 6 */
8 7
9 #if SK_SUPPORT_GPU
10 #include "GrContext.h"
11 #include "GrContextFactory.h"
12 #include "GrRenderTarget.h"
13 #include "SkGpuDevice.h"
14 #include "gl/GrGLDefines.h"
15 #else
16 class GrContext;
17 #endif // SK_SUPPORT_GPU
18
19 #include "BenchTimer.h" 8 #include "BenchTimer.h"
20 #include "SkBenchLogger.h" 9 #include "SkBenchLogger.h"
21 #include "SkBenchmark.h" 10 #include "SkBenchmark.h"
22 #include "SkBitmapDevice.h" 11 #include "SkBitmapDevice.h"
23 #include "SkCanvas.h" 12 #include "SkCanvas.h"
24 #include "SkColorPriv.h" 13 #include "SkColorPriv.h"
25 #include "SkCommandLineFlags.h" 14 #include "SkCommandLineFlags.h"
26 #include "SkDeferredCanvas.h" 15 #include "SkDeferredCanvas.h"
27 #include "SkGraphics.h" 16 #include "SkGraphics.h"
28 #include "SkImageEncoder.h" 17 #include "SkImageEncoder.h"
29 #include "SkOSFile.h" 18 #include "SkOSFile.h"
30 #include "SkPicture.h" 19 #include "SkPicture.h"
31 #include "SkString.h" 20 #include "SkString.h"
32 21
22 #if SK_SUPPORT_GPU
23 #include "GrContext.h"
24 #include "GrContextFactory.h"
25 #include "GrRenderTarget.h"
26 #include "SkGpuDevice.h"
27 #include "gl/GrGLDefines.h"
28 #else
29 class GrContext;
30 #endif // SK_SUPPORT_GPU
31
33 #include <limits> 32 #include <limits>
34 33
35 enum BenchMode { 34 enum BenchMode {
36 kNormal_BenchMode, 35 kNormal_BenchMode,
37 kDeferred_BenchMode, 36 kDeferred_BenchMode,
38 kDeferredSilent_BenchMode, 37 kDeferredSilent_BenchMode,
39 kRecord_BenchMode, 38 kRecord_BenchMode,
40 kPictureRecord_BenchMode 39 kPictureRecord_BenchMode
41 }; 40 };
42 const char* BenchMode_Name[] = { 41 const char* BenchMode_Name[] = {
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 gContextFactory.destroyContexts(); 704 gContextFactory.destroyContexts();
706 #endif 705 #endif
707 return 0; 706 return 0;
708 } 707 }
709 708
710 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 709 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
711 int main(int argc, char * const argv[]) { 710 int main(int argc, char * const argv[]) {
712 return tool_main(argc, (char**) argv); 711 return tool_main(argc, (char**) argv);
713 } 712 }
714 #endif 713 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698