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

Side by Side Diff: dm/DM.cpp

Issue 1306733007: Re-enable nvpr text rendering in DM. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | src/gpu/GrStencilAndCoverTextContext.cpp » ('j') | 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 #include "CrashHandler.h" 8 #include "CrashHandler.h"
9 #include "DMJsonWriter.h" 9 #include "DMJsonWriter.h"
10 #include "DMSrcSink.h" 10 #include "DMSrcSink.h"
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 #define SINK(t, sink, ...) if (0 == strcmp(t, tag)) { return new sink(__VA_ARGS_ _); } 538 #define SINK(t, sink, ...) if (0 == strcmp(t, tag)) { return new sink(__VA_ARGS_ _); }
539 if (gpu_supported()) { 539 if (gpu_supported()) {
540 typedef GrContextFactory Gr; 540 typedef GrContextFactory Gr;
541 const GrGLStandard api = get_gpu_api(); 541 const GrGLStandard api = get_gpu_api();
542 SINK("gpunull", GPUSink, Gr::kNull_GLContextType, api, 0 , false, FLAGS_gpu_threading); 542 SINK("gpunull", GPUSink, Gr::kNull_GLContextType, api, 0 , false, FLAGS_gpu_threading);
543 SINK("gpudebug", GPUSink, Gr::kDebug_GLContextType, api, 0 , false, FLAGS_gpu_threading); 543 SINK("gpudebug", GPUSink, Gr::kDebug_GLContextType, api, 0 , false, FLAGS_gpu_threading);
544 SINK("gpu", GPUSink, Gr::kNative_GLContextType, api, 0 , false, FLAGS_gpu_threading); 544 SINK("gpu", GPUSink, Gr::kNative_GLContextType, api, 0 , false, FLAGS_gpu_threading);
545 SINK("gpudft", GPUSink, Gr::kNative_GLContextType, api, 0 , true, FLAGS_gpu_threading); 545 SINK("gpudft", GPUSink, Gr::kNative_GLContextType, api, 0 , true, FLAGS_gpu_threading);
546 SINK("msaa4", GPUSink, Gr::kNative_GLContextType, api, 4 , false, FLAGS_gpu_threading); 546 SINK("msaa4", GPUSink, Gr::kNative_GLContextType, api, 4 , false, FLAGS_gpu_threading);
547 SINK("msaa16", GPUSink, Gr::kNative_GLContextType, api, 16 , false, FLAGS_gpu_threading); 547 SINK("msaa16", GPUSink, Gr::kNative_GLContextType, api, 16 , false, FLAGS_gpu_threading);
548 SINK("nvprmsaa4", GPUSink, Gr::kNVPR_GLContextType, api, 4 , false, FLAGS_gpu_threading); 548 SINK("nvprmsaa4", GPUSink, Gr::kNVPR_GLContextType, api, 4 , true, FLAGS_gpu_threading);
549 SINK("nvprmsaa16", GPUSink, Gr::kNVPR_GLContextType, api, 16 , false, FLAGS_gpu_threading); 549 SINK("nvprmsaa16", GPUSink, Gr::kNVPR_GLContextType, api, 16 , true, FLAGS_gpu_threading);
550 #if SK_ANGLE 550 #if SK_ANGLE
551 SINK("angle", GPUSink, Gr::kANGLE_GLContextType, api, 0 , false, FLAGS_gpu_threading); 551 SINK("angle", GPUSink, Gr::kANGLE_GLContextType, api, 0 , false, FLAGS_gpu_threading);
552 #endif 552 #endif
553 #if SK_COMMAND_BUFFER 553 #if SK_COMMAND_BUFFER
554 SINK("commandbuffer", GPUSink, Gr::kCommandBuffer_GLContextType, api, 0 , false, FLAGS_gpu_threading); 554 SINK("commandbuffer", GPUSink, Gr::kCommandBuffer_GLContextType, api, 0 , false, FLAGS_gpu_threading);
555 #endif 555 #endif
556 #if SK_MESA 556 #if SK_MESA
557 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0 , false, FLAGS_gpu_threading); 557 SINK("mesa", GPUSink, Gr::kMESA_GLContextType, api, 0 , false, FLAGS_gpu_threading);
558 #endif 558 #endif
559 } 559 }
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 } 1065 }
1066 return 0; 1066 return 0;
1067 } 1067 }
1068 1068
1069 #if !defined(SK_BUILD_FOR_IOS) 1069 #if !defined(SK_BUILD_FOR_IOS)
1070 int main(int argc, char** argv) { 1070 int main(int argc, char** argv) {
1071 SkCommandLineFlags::Parse(argc, argv); 1071 SkCommandLineFlags::Parse(argc, argv);
1072 return dm_main(); 1072 return dm_main();
1073 } 1073 }
1074 #endif 1074 #endif
OLDNEW
« no previous file with comments | « no previous file | src/gpu/GrStencilAndCoverTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698