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

Unified Diff: include/gpu/GrEffect.h

Issue 537773004: Add GrProgramElement base class for GrEffect with deferred exec ref. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comments Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/gpu.gypi ('k') | include/gpu/GrGpuResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrEffect.h
diff --git a/include/gpu/GrEffect.h b/include/gpu/GrEffect.h
index ec1b0ba636063a5903dc6a7cfb4d667643e617a5..b7a6d17af9527ed0a11c3d5d58376a6cfdc62702 100644
--- a/include/gpu/GrEffect.h
+++ b/include/gpu/GrEffect.h
@@ -10,16 +10,14 @@
#include "GrColor.h"
#include "GrEffectUnitTest.h"
-#include "GrTexture.h"
+#include "GrProgramElement.h"
#include "GrTextureAccess.h"
#include "GrTypesPriv.h"
class GrBackendEffectFactory;
class GrContext;
class GrCoordTransform;
-class GrEffect;
-class GrVertexEffect;
-class SkString;
+
/** Provides custom vertex shader, fragment shader, uniform data for a particular stage of the
Ganesh shading pipeline.
@@ -31,7 +29,7 @@ class SkString;
effect must reach 0 before the thread terminates and the pool is destroyed. To create a static
effect use the macro GR_CREATE_STATIC_EFFECT declared below.
*/
-class GrEffect : public SkRefCnt {
+class GrEffect : public GrProgramElement {
public:
SK_DECLARE_INST_COUNT(GrEffect)
@@ -205,7 +203,7 @@ private:
bool fWillUseInputColor;
bool fRequiresVertexShader;
- typedef SkRefCnt INHERITED;
+ typedef GrProgramElement INHERITED;
};
/**
@@ -217,5 +215,4 @@ static SkAlignedSStorage<sizeof(EFFECT_CLASS)> g_##NAME##_Storage;
static GrEffect* NAME SkNEW_PLACEMENT_ARGS(g_##NAME##_Storage.get(), EFFECT_CLASS, ARGS); \
static SkAutoTDestroy<GrEffect> NAME##_ad(NAME);
-
#endif
« no previous file with comments | « gyp/gpu.gypi ('k') | include/gpu/GrGpuResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698