AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix debug build: move assertions to GrContext callers, not static callees.

Browse Source 
Debug build fix; unreviewed.



git-svn-id: http://skia.googlecode.com/svn/trunk@3329 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2012-03-05 20:53:36 +00:00
parent af90f7f142
commit ceb441476e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gpu/GrContext.cpp
View File

@ -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();