diff options
| author |  bsalomon <bsalomon@google.com> | 2014-12-18 06:20:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-18 06:20:52 -0800 |
| commit | 3f490a0c0170feb8b53c220d6c5331c23aeb3f23 (patch) | |
| tree | 948dcdca5c0c38cacc5989189254bc3fed725fb7 | |
| parent | 1348dfd5df187847e991dbf6658f493c6351e1d8 (diff) | |
Fix complexclip3 test on gpu
BUG=skia:3260
R=egdaniel@google.com
Review URL: https://codereview.chromium.org/813653003
| -rw-r--r-- | gm/complexclip3.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp index 1cea1ce7bd..bae5c5a774 100644 --- a/gm/complexclip3.cpp +++ b/gm/complexclip3.cpp @@ -22,7 +22,7 @@ public: protected: uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag | kSkipGPU_Flag; + return kSkipTiled_Flag; } SkString onShortName() { diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index 3bd458ca68..143add51c6 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -449,7 +449,7 @@ void GrClipMaskManager::mergeMask(GrDrawState* drawState, GrTexture* GrClipMaskManager::createTempMask(int width, int height) { GrSurfaceDesc desc; - desc.fFlags = kRenderTarget_GrSurfaceFlag|kNoStencil_GrSurfaceFlag; + desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fWidth = width; desc.fHeight = height; desc.fConfig = kAlpha_8_GrPixelConfig; |