diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 14:35:06 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 14:35:06 +0000 |
| commit | 8aaac8da36bb88ab13c62e84ee6ac9ebc5cb8466 (patch) | |
| tree | 552b0c12f444cdb938f059b046ae1b93dba1bb09 /src | |
| parent | 6b7938f9cb250086a7c6325cf31576f894ca4a1b (diff) | |
Fix build break in assert
git-svn-id: http://skia.googlecode.com/svn/trunk@11771 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index dd45b25090..7ded54df51 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -438,7 +438,7 @@ GrTexture* GrContext::lockAndRefScratchTexture(const GrTextureDesc& inDesc, Scra !(inDesc.fFlags & kNoStencil_GrTextureFlagBit)); // Renderable A8 targets are not universally supported (e.g., not on ANGLE) - SkASSERT(this->isConfigRenderable(kAlpha_8_GrPixelConfig) || + SkASSERT(this->isConfigRenderable(kAlpha_8_GrPixelConfig, inDesc.fSampleCnt > 0) || !(inDesc.fFlags & kRenderTarget_GrTextureFlagBit) || (inDesc.fConfig != kAlpha_8_GrPixelConfig)); |