Make GrGLSLFragmentProcessors be created as std::unique_ptr.
Rename factory function from createGLSLInstance() to makeProgramImpl()
Bug: b/180759848
Bug: skia:11358
Change-Id: I095bdf1f26db5a8192fa8ab59000db4a1d561d96
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/373738
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp
index e3310e2..19305f1 100644
--- a/tests/ProgramsTest.cpp
+++ b/tests/ProgramsTest.cpp
@@ -63,8 +63,8 @@
const char* name() const override { return "Big_Ole_Key"; }
- GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
- return new GLBigKeyProcessor;
+ std::unique_ptr<GrGLSLFragmentProcessor> onMakeProgramImpl() const override {
+ return std::make_unique<GLBigKeyProcessor>();
}
std::unique_ptr<GrFragmentProcessor> clone() const override { return Make(); }
@@ -99,7 +99,9 @@
const char* name() const override { return "Block_Input"; }
- GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new GLFP; }
+ std::unique_ptr<GrGLSLFragmentProcessor> onMakeProgramImpl() const override {
+ return std::make_unique<GLFP>();
+ }
std::unique_ptr<GrFragmentProcessor> clone() const override {
return Make(this->childProcessor(0)->clone());