From ceb441476e1712861e87a9bb428f119349ef6bb5 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Mon, 5 Mar 2012 20:53:36 +0000 Subject: [PATCH] Fix debug build: move assertions to GrContext callers, not static callees. Debug build fix; unreviewed. git-svn-id: http://skia.googlecode.com/svn/trunk@3329 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/GrContext.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 038f953b8e..7ea36da52e 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -262,7 +262,6 @@ void apply_morphology(GrGpu* gpu, int radius, GrSamplerState::Filter filter, GrSamplerState::FilterDirection direction) { - ASSERT_OWNED_RESOURCE(texture); GrAssert(filter == GrSamplerState::kErode_Filter || filter == GrSamplerState::kDilate_Filter); @@ -287,8 +286,6 @@ void convolve(GrGpu* gpu, const float* kernel, int kernelWidth, GrSamplerState::FilterDirection direction) { - ASSERT_OWNED_RESOURCE(texture); - GrDrawTarget::AutoStateRestore asr(gpu); GrDrawState* drawState = gpu->drawState(); GrRenderTarget* target = drawState->getRenderTarget(); @@ -2097,6 +2094,7 @@ GrTexture* GrContext::gaussianBlur(GrTexture* srcTexture, GrAutoScratchTexture* temp2, const SkRect& rect, float sigmaX, float sigmaY) { + ASSERT_OWNED_RESOURCE(srcTexture); GrRenderTarget* oldRenderTarget = this->getRenderTarget(); GrClip oldClip = this->getClip(); GrTexture* origTexture = srcTexture; @@ -2215,6 +2213,7 @@ GrTexture* GrContext::applyMorphology(GrTexture* srcTexture, GrTexture* temp1, GrTexture* temp2, GrSamplerState::Filter filter, SkISize radius) { + ASSERT_OWNED_RESOURCE(srcTexture); GrRenderTarget* oldRenderTarget = this->getRenderTarget(); GrAutoMatrix avm(this, GrMatrix::I()); GrClip oldClip = this->getClip();