diff options
Diffstat (limited to 'chromium/third_party/skia/tools/flags')
3 files changed, 12 insertions, 1 deletions
diff --git a/chromium/third_party/skia/tools/flags/CommonFlagsConfig.cpp b/chromium/third_party/skia/tools/flags/CommonFlagsConfig.cpp index fa0c414363e..0dc0a52d470 100644 --- a/chromium/third_party/skia/tools/flags/CommonFlagsConfig.cpp +++ b/chromium/third_party/skia/tools/flags/CommonFlagsConfig.cpp @@ -72,6 +72,7 @@ static const struct { { "gltestprecompile", "gpu", "api=gl,testPrecompile=true" }, { "glestestprecompile", "gpu", "api=gles,testPrecompile=true" }, { "glddl", "gpu", "api=gl,useDDLSink=true" }, + { "glooprddl", "gpu", "api=gl,OOPRish=true" }, { "angle_d3d11_es2", "gpu", "api=angle_d3d11_es2" }, { "angle_d3d11_es3", "gpu", "api=angle_d3d11_es3" }, { "angle_d3d9_es2", "gpu", "api=angle_d3d9_es2" }, @@ -103,6 +104,7 @@ static const struct { { "vkbert", "gpu", "api=vulkan,surf=bert" }, { "vktestpersistentcache", "gpu", "api=vulkan,testPersistentCache=1" }, { "vkddl", "gpu", "api=vulkan,useDDLSink=true" }, + { "vkooprddl", "gpu", "api=vulkan,OOPRish=true" }, #endif #ifdef SK_METAL { "mtl", "gpu", "api=metal" }, @@ -110,6 +112,7 @@ static const struct { { "mtlmsaa4", "gpu", "api=metal,samples=4" }, { "mtlmsaa8", "gpu", "api=metal,samples=8" }, { "mtlddl", "gpu", "api=metal,useDDLSink=true" }, + { "mtlooprddl", "gpu", "api=metal,OOPRish=true" }, #endif #ifdef SK_DIRECT3D { "d3d", "gpu", "api=direct3d" }, @@ -459,6 +462,7 @@ SkCommandLineConfigGpu::SkCommandLineConfigGpu(const SkString& tag, int testPersistentCache, bool testPrecompile, bool useDDLSink, + bool OOPRish, SurfType surfType) : SkCommandLineConfig(tag, SkString("gpu"), viaParts) , fContextType(contextType) @@ -472,6 +476,7 @@ SkCommandLineConfigGpu::SkCommandLineConfigGpu(const SkString& tag, , fTestPersistentCache(testPersistentCache) , fTestPrecompile(testPrecompile) , fUseDDLSink(useDDLSink) + , fOOPRish(OOPRish) , fSurfType(surfType) { if (!useStencilBuffers) { fContextOverrides |= ContextOverrides::kAvoidStencilBuffers; @@ -493,6 +498,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& int testPersistentCache = 0; bool testPrecompile = false; bool useDDLs = false; + bool ooprish = false; SkCommandLineConfigGpu::SurfType surfType = SkCommandLineConfigGpu::SurfType::kDefault; bool parseSucceeded = false; @@ -511,6 +517,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& extendedOptions.get_option_int("testPersistentCache", &testPersistentCache) && extendedOptions.get_option_bool("testPrecompile", &testPrecompile) && extendedOptions.get_option_bool("useDDLSink", &useDDLs) && + extendedOptions.get_option_bool("OOPRish", &ooprish) && extendedOptions.get_option_gpu_surf_type("surf", &surfType); // testing threading and the persistent cache are mutually exclusive. @@ -531,6 +538,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& testPersistentCache, testPrecompile, useDDLs, + ooprish, surfType); } diff --git a/chromium/third_party/skia/tools/flags/CommonFlagsConfig.h b/chromium/third_party/skia/tools/flags/CommonFlagsConfig.h index f4ae2949ea1..02bd8569a41 100644 --- a/chromium/third_party/skia/tools/flags/CommonFlagsConfig.h +++ b/chromium/third_party/skia/tools/flags/CommonFlagsConfig.h @@ -64,6 +64,7 @@ public: int testPersistentCache, bool testPrecompile, bool useDDLSink, + bool OOPRish, SurfType); const SkCommandLineConfigGpu* asConfigGpu() const override { return this; } @@ -78,6 +79,7 @@ public: int getTestPersistentCache() const { return fTestPersistentCache; } bool getTestPrecompile() const { return fTestPrecompile; } bool getUseDDLSink() const { return fUseDDLSink; } + bool getOOPRish() const { return fOOPRish; } SurfType getSurfType() const { return fSurfType; } private: @@ -92,6 +94,7 @@ private: int fTestPersistentCache; bool fTestPrecompile; bool fUseDDLSink; + bool fOOPRish; SurfType fSurfType; }; diff --git a/chromium/third_party/skia/tools/flags/CommonFlagsGpu.cpp b/chromium/third_party/skia/tools/flags/CommonFlagsGpu.cpp index b00bf8892d8..4f15944e750 100644 --- a/chromium/third_party/skia/tools/flags/CommonFlagsGpu.cpp +++ b/chromium/third_party/skia/tools/flags/CommonFlagsGpu.cpp @@ -60,7 +60,7 @@ static GpuPathRenderers get_named_pathrenderers_flags(const char* name) { } else if (!strcmp(name, "default")) { return GpuPathRenderers::kDefault; } - SK_ABORT(SkStringPrintf("error: unknown named path renderer \"%s\"\n", name).c_str()); + SK_ABORT("error: unknown named path renderer \"%s\"\n", name); } static GpuPathRenderers collect_gpu_path_renderers_from_flags() { |