diff options
| author |  bsalomon <bsalomon@google.com> | 2014-07-11 10:01:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-11 10:01:02 -0700 |
| commit | 848faf00ec33d39ab3e31e9a11d805cae6ac6562 (patch) | |
| tree | 3bc20e70f262fb5a7864796e890512b8006518ef /src/effects/gradients | |
| parent | 6ca0b6a46cbe9bef3e2b9b9db813ec864efd62de (diff) | |
This moves us towards variable length effect keys. The overall program key now allows for it. After the header it stores an array of offsets to effect keys. This allows us to grab the effect keys to pass to effects when they generate code. It also ensures that we can't get a collision by sets of keys that are different lengths but are the same when appended together.
R=robertphillips@google.com, jvanverth@google.com, egdaniel@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/356513003
Diffstat (limited to 'src/effects/gradients')
| -rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 1 | ||||
| -rw-r--r-- | src/effects/gradients/SkLinearGradient.cpp | 1 | ||||
| -rw-r--r-- | src/effects/gradients/SkRadialGradient.cpp | 1 | ||||
| -rw-r--r-- | src/effects/gradients/SkSweepGradient.cpp | 1 | ||||
| -rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp | 1 | ||||
| -rw-r--r-- | src/effects/gradients/SkTwoPointRadialGradient.cpp | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index fe720b832c..fb8a7e5c8f 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -852,6 +852,7 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END #include "effects/GrTextureStripAtlas.h" #include "GrTBackendEffectFactory.h" +#include "gl/GrGLShaderBuilder.h" #include "SkGr.h" GrGLGradientEffect::GrGLGradientEffect(const GrBackendEffectFactory& factory) diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 113877cfe0..332c9b4af9 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -446,6 +446,7 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y, #if SK_SUPPORT_GPU #include "GrTBackendEffectFactory.h" +#include "gl/GrGLShaderBuilder.h" #include "SkGr.h" ///////////////////////////////////////////////////////////////////// diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 2267d8d5bb..e3aaea341f 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -458,6 +458,7 @@ void SkRadialGradient::RadialGradientContext::shadeSpan(int x, int y, #if SK_SUPPORT_GPU #include "GrTBackendEffectFactory.h" +#include "gl/GrGLShaderBuilder.h" #include "SkGr.h" class GrGLRadialGradient : public GrGLGradientEffect { diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 1ba044386d..bb9d628968 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -174,6 +174,7 @@ void SkSweepGradient::SweepGradientContext::shadeSpan16(int x, int y, uint16_t* #if SK_SUPPORT_GPU #include "GrTBackendEffectFactory.h" +#include "gl/GrGLShaderBuilder.h" #include "SkGr.h" class GrGLSweepGradient : public GrGLGradientEffect { diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index 4d0aa0fbfc..8beb6fb828 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -12,6 +12,7 @@ #if SK_SUPPORT_GPU #include "GrTBackendEffectFactory.h" +#include "gl/GrGLShaderBuilder.h" // For brevity typedef GrGLUniformManager::UniformHandle UniformHandle; diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 79c231d49a..a97cc0c38d 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -383,6 +383,7 @@ void SkTwoPointRadialGradient::init() { #if SK_SUPPORT_GPU #include "GrTBackendEffectFactory.h" +#include "gl/GrGLShaderBuilder.h" #include "SkGr.h" // For brevity |