From bc2f1dc85e458af7bdb87873e60207f9f7299e4a Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 23 Apr 2014 09:11:58 +0000 Subject: Extract most of the mutable state of SkShader into a separate Context object. SkShader currently stores some state during draw calls via setContext(...). Move that mutable state into a separate SkShader::Context class that is constructed on demand for the duration of the draw. Calls to setContext() are replaced with createContext() which returns a context corresponding to the shader object or NULL if the parameters to createContext are invalid. TEST=out/Debug/dm BUG=skia:1976 Committed: http://code.google.com/p/skia/source/detail?r=14216 R=scroggo@google.com, skyostil@chromium.org, tomhudson@chromium.org, senorblanco@chromium.org, reed@google.com, bungeman@google.com Author: dominikg@chromium.org Review URL: https://codereview.chromium.org/207683004 git-svn-id: http://skia.googlecode.com/svn/trunk@14323 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkCoreBlitters.h | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'src/core/SkCoreBlitters.h') diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h index 285184050b..2d22d38e78 100644 --- a/src/core/SkCoreBlitters.h +++ b/src/core/SkCoreBlitters.h @@ -27,12 +27,29 @@ private: class SkShaderBlitter : public SkRasterBlitter { public: - SkShaderBlitter(const SkBitmap& device, const SkPaint& paint); + /** + * The storage for shaderContext is owned by the caller, but the object itself is not. + * The blitter only ensures that the storage always holds a live object, but it may + * exchange that object. + */ + SkShaderBlitter(const SkBitmap& device, const SkPaint& paint, + SkShader::Context* shaderContext); virtual ~SkShaderBlitter(); + /** + * Create a new shader context and uses it instead of the old one if successful. + * Will create the context at the same location as the old one (this is safe + * because the shader itself is unchanged). + */ + virtual bool resetShaderContext(const SkBitmap& device, const SkPaint& paint, + const SkMatrix& matrix) SK_OVERRIDE; + + virtual SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; } + protected: - uint32_t fShaderFlags; - SkShader* fShader; + uint32_t fShaderFlags; + const SkShader* fShader; + SkShader::Context* fShaderContext; private: // illegal @@ -75,7 +92,8 @@ private: class SkA8_Shader_Blitter : public SkShaderBlitter { public: - SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint); + SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, + SkShader::Context* shaderContext); virtual ~SkA8_Shader_Blitter(); virtual void blitH(int x, int y, int width); virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]); @@ -141,7 +159,8 @@ private: class SkARGB32_Shader_Blitter : public SkShaderBlitter { public: - SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint); + SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, + SkShader::Context* shaderContext); virtual ~SkARGB32_Shader_Blitter(); virtual void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; @@ -179,6 +198,7 @@ private: */ SkBlitter* SkBlitter_ChooseD565(const SkBitmap& device, const SkPaint& paint, + SkShader::Context* shaderContext, SkTBlitterAllocator* allocator); #endif -- cgit v1.2.3