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

Side by Side Diff: dm/DM.cpp

Issue 1746253002: Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pix… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase and switch back to kN32 color type. Fixes DM crash on some configs. Created 4 years, 9 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 | dm/DMSrcSink.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 /* 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 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 contextOptions = static_cast<GrContextFactory::GLContextOptions> ( 732 contextOptions = static_cast<GrContextFactory::GLContextOptions> (
733 contextOptions | GrContextFactory::kEnableNVPR_GLContextOpti ons); 733 contextOptions | GrContextFactory::kEnableNVPR_GLContextOpti ons);
734 } 734 }
735 GrContextFactory testFactory; 735 GrContextFactory testFactory;
736 if (!testFactory.get(contextType, contextOptions)) { 736 if (!testFactory.get(contextType, contextOptions)) {
737 SkDebugf("WARNING: can not create GPU context for config '%s'. " 737 SkDebugf("WARNING: can not create GPU context for config '%s'. "
738 "GM tests will be skipped.\n", gpuConfig->getTag().c_st r()); 738 "GM tests will be skipped.\n", gpuConfig->getTag().c_st r());
739 return nullptr; 739 return nullptr;
740 } 740 }
741 return new GPUSink(contextType, contextOptions, gpuConfig->getSample s(), 741 return new GPUSink(contextType, contextOptions, gpuConfig->getSample s(),
742 gpuConfig->getUseDIText(), FLAGS_gpu_threading); 742 gpuConfig->getUseDIText(), gpuConfig->getColorTyp e(),
743 gpuConfig->getProfileType(), FLAGS_gpu_threading) ;
743 } 744 }
744 } 745 }
745 #endif 746 #endif
746 747
747 #define SINK(t, sink, ...) if (config->getBackend().equals(t)) { return new sink (__VA_ARGS__); } 748 #define SINK(t, sink, ...) if (config->getBackend().equals(t)) { return new sink (__VA_ARGS__); }
748 749
749 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK 750 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
750 SINK("hwui", HWUISink); 751 SINK("hwui", HWUISink);
751 #endif 752 #endif
752 753
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1394 Reporter* reporter, 1395 Reporter* reporter,
1395 GrContextFactory* fac tory); 1396 GrContextFactory* fac tory);
1396 } // namespace skiatest 1397 } // namespace skiatest
1397 1398
1398 #if !defined(SK_BUILD_FOR_IOS) 1399 #if !defined(SK_BUILD_FOR_IOS)
1399 int main(int argc, char** argv) { 1400 int main(int argc, char** argv) {
1400 SkCommandLineFlags::Parse(argc, argv); 1401 SkCommandLineFlags::Parse(argc, argv);
1401 return dm_main(); 1402 return dm_main();
1402 } 1403 }
1403 #endif 1404 #endif
OLDNEW
« no previous file with comments | « no previous file | dm/DMSrcSink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698