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

Side by Side Diff: tests/GLProgramsTest.cpp

Issue 1314763009: Remove overly complicated GR_CREATE_STATIC_PROCESSOR macro (Closed) Base URL: https://chromium.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 | « src/gpu/effects/GrDitherEffect.cpp ('k') | no next file » | 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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 // This is a GPU-backend specific test. It relies on static intializers to work 9 // This is a GPU-backend specific test. It relies on static intializers to work
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 } 56 }
57 57
58 private: 58 private:
59 typedef GrGLFragmentProcessor INHERITED; 59 typedef GrGLFragmentProcessor INHERITED;
60 }; 60 };
61 61
62 class BigKeyProcessor : public GrFragmentProcessor { 62 class BigKeyProcessor : public GrFragmentProcessor {
63 public: 63 public:
64 static GrFragmentProcessor* Create() { 64 static GrFragmentProcessor* Create() {
65 GR_CREATE_STATIC_PROCESSOR(gBigKeyProcessor, BigKeyProcessor, ()) 65 static BigKeyProcessor gBigKeyProcessor;
66 return SkRef(gBigKeyProcessor); 66 return SkRef(&gBigKeyProcessor);
67 } 67 }
68 68
69 const char* name() const override { return "Big Ole Key"; } 69 const char* name() const override { return "Big Ole Key"; }
70 70
71 GrGLFragmentProcessor* onCreateGLInstance() const override { 71 GrGLFragmentProcessor* onCreateGLInstance() const override {
72 return new GLBigKeyProcessor(*this); 72 return new GLBigKeyProcessor(*this);
73 } 73 }
74 74
75 private: 75 private:
76 BigKeyProcessor() { 76 BigKeyProcessor() {
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 } 296 }
297 #endif 297 #endif
298 GrTestTarget target; 298 GrTestTarget target;
299 context->getTestTarget(&target); 299 context->getTestTarget(&target);
300 REPORTER_ASSERT(reporter, target.target()->programUnitTest(context, maxStages)); 300 REPORTER_ASSERT(reporter, target.target()->programUnitTest(context, maxStages));
301 } 301 }
302 } 302 }
303 } 303 }
304 304
305 #endif 305 #endif
OLDNEW
« no previous file with comments | « src/gpu/effects/GrDitherEffect.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698