diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-02 21:05:45 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-02 21:05:45 +0000 |
| commit | 05054f1a78a697b507580d0025db6c90423e033f (patch) | |
| tree | fa00f0862980cdc712f21d2d792d59fe070ebcaa /src/gpu/gl/GrGpuGL.cpp | |
| parent | c8ccfb0fbadfdcadcc860bc648c5ac42aa9277b1 (diff) | |
Erode and dilate image filter effects, CPU and GPU implementations.
Review URL: http://codereview.appspot.com/5656067/
git-svn-id: http://skia.googlecode.com/svn/trunk@3310 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index bee2017272..69880e5555 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -445,7 +445,7 @@ void GrGpuGL::onResetContext() { -GR_ScalarMax, true); *fHWDrawState.sampler(s)->matrix() = GrMatrix::InvalidMatrix(); - fHWDrawState.sampler(s)->setConvolutionParams(0, NULL, NULL); + fHWDrawState.sampler(s)->setConvolutionParams(0, NULL); } fHWBounds.fScissorRect.invalidate(); @@ -1935,6 +1935,8 @@ unsigned gr_to_gl_filter(GrSamplerState::Filter filter) { return GR_GL_LINEAR; case GrSamplerState::kNearest_Filter: case GrSamplerState::kConvolution_Filter: + case GrSamplerState::kErode_Filter: + case GrSamplerState::kDilate_Filter: return GR_GL_NEAREST; default: GrAssert(!"Unknown filter type"); |