diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-03 15:17:58 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-03 15:17:58 +0000 |
| commit | 3390b9ac9ad69a6e772c2b957d75d19611239025 (patch) | |
| tree | 39b8dfb8c27086d504a1ecf139120e346efe3b54 /include/gpu | |
| parent | 17cb562da95ff3bdfdd7b754a8e572e1ff528de6 (diff) | |
Repurpose GrGLCoordTransform as GrGLProgramEffects
Creates a GrGLProgramEffects class that the GrGLProgram uses to manage
an array of effects. This gives us enough abstraction for the program
to cleanly handle different types of coord transforms.
R=bsalomon@google.com
Author: cdalton@nvidia.com
Review URL: https://codereview.chromium.org/25605008
git-svn-id: http://skia.googlecode.com/svn/trunk@11588 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrTBackendEffectFactory.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/gpu/GrTBackendEffectFactory.h b/include/gpu/GrTBackendEffectFactory.h index 9528f8a367..3711c7e869 100644 --- a/include/gpu/GrTBackendEffectFactory.h +++ b/include/gpu/GrTBackendEffectFactory.h @@ -10,6 +10,7 @@ #include "GrBackendEffectFactory.h" #include "GrDrawEffect.h" +#include "gl/GrGLProgramEffects.h" /** * Implements GrBackendEffectFactory for a GrEffect subclass as a singleton. @@ -34,9 +35,9 @@ public: const GrGLCaps& caps) const SK_OVERRIDE { SkASSERT(kIllegalEffectClassID != fEffectClassID); EffectKey effectKey = GLEffect::GenKey(drawEffect, caps); - EffectKey textureKey = GLEffect::GenTextureKey(drawEffect, caps); - EffectKey transformKey = GLEffect::GenTransformKey(drawEffect); - EffectKey attribKey = GLEffect::GenAttribKey(drawEffect); + EffectKey textureKey = GrGLProgramEffects::GenTextureKey(drawEffect, caps); + EffectKey transformKey = GrGLProgramEffects::GenTransformKey(drawEffect); + EffectKey attribKey = GrGLProgramEffects::GenAttribKey(drawEffect); #ifdef SK_DEBUG static const EffectKey kIllegalEffectKeyMask = (uint16_t) (~((1U << kEffectKeyBits) - 1)); SkASSERT(!(kIllegalEffectKeyMask & effectKey)); |