diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h index 7c2d97b804..6e11bc246c 100644 --- a/include/gpu/GrContextOptions.h +++ b/include/gpu/GrContextOptions.h @@ -160,7 +160,7 @@ struct SK_API GrContextOptions { * Allow Ganesh to more aggressively reorder operations. * Eventually this will just be what is done and will not be optional. */ - Enable fReduceOpListSplitting = Enable::kDefault; + Enable fReduceOpsTaskSplitting = Enable::kDefault; /** * Some ES3 contexts report the ES2 external image extension, but not the ES3 version. diff --git a/src/gpu/GrLegacyDirectContext.cpp b/src/gpu/GrLegacyDirectContext.cpp index dbdcd5ce22..15746e9d71 100644 --- a/src/gpu/GrLegacyDirectContext.cpp +++ b/src/gpu/GrLegacyDirectContext.cpp @@ -83,9 +83,9 @@ protected: } bool reduceOpsTaskSplitting = kDefaultReduceOpsTaskSplitting; - if (GrContextOptions::Enable::kNo == this->options().fReduceOpListSplitting) { + if (GrContextOptions::Enable::kNo == this->options().fReduceOpsTaskSplitting) { reduceOpsTaskSplitting = false; - } else if (GrContextOptions::Enable::kYes == this->options().fReduceOpListSplitting) { + } else if (GrContextOptions::Enable::kYes == this->options().fReduceOpsTaskSplitting) { reduceOpsTaskSplitting = true; } diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index eaf5f23fa2..8d616d63d0 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -366,7 +366,7 @@ DEF_GPUTEST(GrManyDependentsMipMappedTest, reporter, /* options */) { GrMockOptions mockOptions; mockOptions.fMipMapSupport = true; GrContextOptions ctxOptions; - ctxOptions.fReduceOpListSplitting = enableSortingAndReduction; + ctxOptions.fReduceOpsTaskSplitting = enableSortingAndReduction; sk_sp context = GrContext::MakeMock(&mockOptions, ctxOptions); if (!context) { ERRORF(reporter, "could not create mock context with fReduceOpsTaskSplitting %s.", diff --git a/tools/flags/CommonFlagsGpu.cpp b/tools/flags/CommonFlagsGpu.cpp index 7ed0d30d66..d341ce5a75 100644 --- a/tools/flags/CommonFlagsGpu.cpp +++ b/tools/flags/CommonFlagsGpu.cpp @@ -91,8 +91,8 @@ void SetCtxOptionsFromCommonFlags(GrContextOptions* ctxOptions) { if (FLAGS_reduceOpsTaskSplitting) { SkASSERT(!FLAGS_dontReduceOpsTaskSplitting); - ctxOptions->fReduceOpListSplitting = GrContextOptions::Enable::kYes; + ctxOptions->fReduceOpsTaskSplitting = GrContextOptions::Enable::kYes; } else if (FLAGS_dontReduceOpsTaskSplitting) { - ctxOptions->fReduceOpListSplitting = GrContextOptions::Enable::kNo; + ctxOptions->fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo; } }