revert 8265-8264 (broke build)
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 20 Mar 2013 17:47:16 +0000 (17:47 +0000)
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 20 Mar 2013 17:47:16 +0000 (17:47 +0000)
commit67e7cde5c5e59a8f1de7ee28276b8193ecb2bc7f
treefbb2c63213570deb6062b3eb8e9ba1a13c0431d4
parent113994051b41366a7b25851d05cd56e89866a33b
revert 8265-8264 (broke build)

git-svn-id: http://skia.googlecode.com/svn/trunk@8268 2bbb7eff-a529-9590-31e7-b0007b416f81
53 files changed:
include/core/SkTLazy.h
include/gpu/GrBackendEffectFactory.h
include/gpu/GrContext.h
include/gpu/GrDrawEffect.h [deleted file]
include/gpu/GrEffect.h
include/gpu/GrEffectStage.h
include/gpu/GrPaint.h
include/gpu/GrTBackendEffectFactory.h
src/effects/SkBicubicImageFilter.cpp
src/effects/SkBlendImageFilter.cpp
src/effects/SkColorMatrixFilter.cpp
src/effects/SkDisplacementMapEffect.cpp
src/effects/SkLightingImageFilter.cpp
src/effects/SkMagnifierImageFilter.cpp
src/effects/SkMatrixConvolutionImageFilter.cpp
src/effects/SkMorphologyImageFilter.cpp
src/effects/SkTableColorFilter.cpp
src/effects/gradients/SkGradientShader.cpp
src/effects/gradients/SkGradientShaderPriv.h
src/effects/gradients/SkLinearGradient.cpp
src/effects/gradients/SkRadialGradient.cpp
src/effects/gradients/SkSweepGradient.cpp
src/effects/gradients/SkTwoPointConicalGradient.cpp
src/effects/gradients/SkTwoPointRadialGradient.cpp
src/gpu/GrClipMaskManager.cpp
src/gpu/GrContext.cpp
src/gpu/GrDrawState.cpp
src/gpu/GrDrawState.h
src/gpu/GrDrawTarget.cpp
src/gpu/GrDrawTarget.h
src/gpu/GrInOrderDrawBuffer.cpp
src/gpu/GrInOrderDrawBuffer.h
src/gpu/GrSWMaskHelper.cpp
src/gpu/GrTextContext.cpp
src/gpu/effects/GrCircleEdgeEffect.cpp
src/gpu/effects/GrConfigConversionEffect.cpp
src/gpu/effects/GrConvolutionEffect.cpp
src/gpu/effects/GrEllipseEdgeEffect.cpp
src/gpu/effects/GrSimpleTextureEffect.cpp
src/gpu/effects/GrSimpleTextureEffect.h
src/gpu/effects/GrSingleTextureEffect.cpp
src/gpu/effects/GrSingleTextureEffect.h
src/gpu/effects/GrTextureDomainEffect.cpp
src/gpu/effects/GrTextureDomainEffect.h
src/gpu/gl/GrGLEffect.cpp
src/gpu/gl/GrGLEffect.h
src/gpu/gl/GrGLEffectMatrix.cpp
src/gpu/gl/GrGLEffectMatrix.h
src/gpu/gl/GrGLProgram.cpp
src/gpu/gl/GrGLProgram.h
src/gpu/gl/GrGLShaderBuilder.cpp
src/gpu/gl/GrGLShaderBuilder.h
tests/GLProgramsTest.cpp