aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2016-03-03 14:23:47 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-03 14:23:47 -0800
commite38bcaf24b00066e167e03a5ac63cf828914d747 (patch)
tree88b3764be24dbf59e7a6e3d88beeb66f12c64dda /experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h
parentce56026db55d8585c2f920a6107a25b40fd5160a (diff)
Revert of enforce 16byte alignment in shader contexts (patchset #1 id:1 of https://codereview.chromium.org/1759653004/ )
Reason for revert: Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86-Debug failed dm: .... FYI: loaded 23439 distinct uninteresting hashes from 23439 lines Skipping config gpu: Don't understand 'gpu'. Skipping config msaa16: Don't understand 'msaa16'. 168400 srcs * 7 sinks + 481 tests == 1179281 tasks 0ns elapsed, 5 active, 1179276 queued, 55MB RAM, 55MB peak 565 gm xfermodes2 565 gm xfermodes 565 gm xfermodeimagefilter 565 gm xfermodes3 565 gm verylarge_picture_image c:\0\build\slave\workdir\build\skia\src\core\skshader.cpp:108: fatal error: ""(0 == ((size) & 15))"" step returned non-zero exit code: 3 @@@STEP_FAILURE@@@ Original issue's description: > enforce 16byte alignment in shader contexts > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1759653004 > > Committed: https://skia.googlesource.com/skia/+/d812fb458807245daa812adb7af0733cf5b54d96 TBR=mtklein@google.com,fmalita@chromium.org,herb@google.com,reed@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1759323002
Diffstat (limited to 'experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h')
-rw-r--r--experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h
index fac098ab52..a129ef8bcd 100644
--- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h
+++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h
@@ -80,9 +80,12 @@ 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 SkPerlinNoiseShader2& shader, const ContextRec&);
@@ -115,7 +118,6 @@ public:
protected:
void flatten(SkWriteBuffer&) const override;
- size_t onContextSize(const ContextRec&) const override;
Context* onCreateContext(const ContextRec&, void* storage) const override;
private: