diff options
author | reed <reed@google.com> | 2016-03-03 18:18:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 18:18:25 -0800 |
commit | 773ceda51ca120b686ba2d1aff1b6d5173143be0 (patch) | |
tree | 5faf3b331ea786b46841cdd3f2f0fedf3562ad16 /include/effects/SkPerlinNoiseShader.h | |
parent | f98bc6d618fb7317abff05b3b4351ff24e4fb560 (diff) |
Enforce 16byte alignment in shader contexts (patchset #1 id:1 of https://codereview.chromium.org/1759653004/ )"
This reverts commit e38bcaf24b00066e167e03a5ac63cf828914d747.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1763973002
TBR=
Review URL: https://codereview.chromium.org/1763973002
Diffstat (limited to 'include/effects/SkPerlinNoiseShader.h')
-rw-r--r-- | include/effects/SkPerlinNoiseShader.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index e9c22d44fc..d9b0277f92 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -68,12 +68,9 @@ public: static SkShader* CreateTubulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, int numOctaves, SkScalar seed, const SkISize* tileSize = NULL) { - return CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, tileSize); + return CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, tileSize); } - - size_t contextSize(const ContextRec&) const override; - class PerlinNoiseShaderContext : public SkShader::Context { public: PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&); @@ -106,6 +103,7 @@ public: protected: void flatten(SkWriteBuffer&) const override; Context* onCreateContext(const ContextRec&, void* storage) const override; + size_t onContextSize(const ContextRec&) const override; private: SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX, |