Merge GrGLSLCaps into GrShaderCaps
authorBrian Salomon <bsalomon@google.com>
Tue, 29 Nov 2016 18:43:05 +0000 (13:43 -0500)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Tue, 29 Nov 2016 19:32:31 +0000 (19:32 +0000)
commit94efbf51f5a88d9e8aa961d3fbe38c5e335d6108
tree2723f6ec5bfc291d4a52adf961165e3e74a098ca
parente11b614795bbe707d131ad599ead5be452e7c06f
Merge GrGLSLCaps into GrShaderCaps

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121

Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8
Reviewed-on: https://skia-review.googlesource.com/5121
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
136 files changed:
bench/GLInstancedArraysBench.cpp
bench/GLVec4ScalarBench.cpp
bench/GLVertexAttributesBench.cpp
experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp
gn/gpu.gni
include/gpu/GrCaps.h
include/gpu/GrFragmentProcessor.h
include/gpu/GrShaderCaps.h [moved from src/gpu/glsl/GrGLSLCaps.h with 68% similarity]
include/gpu/GrShaderVar.h
include/gpu/GrXferProcessor.h
include/gpu/effects/GrConstColorProcessor.h
include/private/GrGLSL.h [moved from src/gpu/glsl/GrGLSL.h with 99% similarity]
include/private/GrGLSL_impl.h [moved from src/gpu/glsl/GrGLSL_impl.h with 100% similarity]
include/private/GrSwizzle.h [moved from src/gpu/GrSwizzle.h with 100% similarity]
src/core/SkColorMatrixFilterRowMajor255.cpp
src/core/SkLightingShader.cpp
src/core/SkNormalBevelSource.cpp
src/core/SkNormalFlatSource.cpp
src/core/SkNormalMapSource.cpp
src/core/SkRadialShadowMapShader.cpp
src/core/SkShadowShader.cpp
src/effects/GrAlphaThresholdFragmentProcessor.cpp
src/effects/GrAlphaThresholdFragmentProcessor.h
src/effects/GrCircleBlurFragmentProcessor.cpp
src/effects/GrCircleBlurFragmentProcessor.h
src/effects/SkArithmeticMode_gpu.cpp
src/effects/SkArithmeticMode_gpu.h
src/effects/SkBlurMaskFilter.cpp
src/effects/SkColorCubeFilter.cpp
src/effects/SkDisplacementMapEffect.cpp
src/effects/SkGaussianEdgeShader.cpp
src/effects/SkLightingImageFilter.cpp
src/effects/SkLumaColorFilter.cpp
src/effects/SkMagnifierImageFilter.cpp
src/effects/SkMorphologyImageFilter.cpp
src/effects/SkOverdrawColorFilter.cpp
src/effects/SkPerlinNoiseShader.cpp
src/effects/SkRRectsGaussianEdgeMaskFilter.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_gpu.cpp
src/gpu/GrCaps.cpp
src/gpu/GrDefaultGeoProcFactory.cpp
src/gpu/GrFragmentProcessor.cpp
src/gpu/GrOvalRenderer.cpp
src/gpu/GrPathProcessor.cpp
src/gpu/GrPathProcessor.h
src/gpu/GrPathRendererChain.cpp
src/gpu/GrPrimitiveProcessor.h
src/gpu/GrProgramDesc.cpp
src/gpu/GrProgramDesc.h
src/gpu/GrRenderTargetContext.cpp
src/gpu/GrShaderCaps.cpp [moved from src/gpu/glsl/GrGLSLCaps.cpp with 73% similarity]
src/gpu/GrShaderVar.cpp
src/gpu/GrXferProcessor.cpp
src/gpu/batches/GrAAConvexPathRenderer.cpp
src/gpu/batches/GrAnalyticRectBatch.cpp
src/gpu/batches/GrMSAAPathRenderer.cpp
src/gpu/batches/GrPLSPathRenderer.cpp
src/gpu/effects/GrBezierEffect.cpp
src/gpu/effects/GrBezierEffect.h
src/gpu/effects/GrBicubicEffect.cpp
src/gpu/effects/GrBicubicEffect.h
src/gpu/effects/GrBitmapTextGeoProc.cpp
src/gpu/effects/GrBitmapTextGeoProc.h
src/gpu/effects/GrConfigConversionEffect.cpp
src/gpu/effects/GrConfigConversionEffect.h
src/gpu/effects/GrConstColorProcessor.cpp
src/gpu/effects/GrConvexPolyEffect.cpp
src/gpu/effects/GrConvexPolyEffect.h
src/gpu/effects/GrConvolutionEffect.cpp
src/gpu/effects/GrConvolutionEffect.h
src/gpu/effects/GrCoverageSetOpXP.cpp
src/gpu/effects/GrCustomXfermode.cpp
src/gpu/effects/GrDashingEffect.cpp
src/gpu/effects/GrDisableColorXP.cpp
src/gpu/effects/GrDistanceFieldGeoProc.cpp
src/gpu/effects/GrDistanceFieldGeoProc.h
src/gpu/effects/GrDitherEffect.cpp
src/gpu/effects/GrGammaEffect.cpp
src/gpu/effects/GrGammaEffect.h
src/gpu/effects/GrMatrixConvolutionEffect.cpp
src/gpu/effects/GrMatrixConvolutionEffect.h
src/gpu/effects/GrOvalEffect.cpp
src/gpu/effects/GrPorterDuffXferProcessor.cpp
src/gpu/effects/GrRRectEffect.cpp
src/gpu/effects/GrShadowGeoProc.cpp
src/gpu/effects/GrShadowGeoProc.h
src/gpu/effects/GrSimpleTextureEffect.cpp
src/gpu/effects/GrSimpleTextureEffect.h
src/gpu/effects/GrTextureDomain.cpp
src/gpu/effects/GrTextureDomain.h
src/gpu/effects/GrXfermodeFragmentProcessor.cpp
src/gpu/effects/GrYUVEffect.cpp
src/gpu/gl/GrGLCaps.cpp
src/gpu/gl/GrGLCaps.h
src/gpu/gl/GrGLGLSL.cpp
src/gpu/gl/GrGLGLSL.h
src/gpu/gl/GrGLGpu.cpp
src/gpu/gl/GrGLTexture.cpp
src/gpu/gl/GrGLUniformHandler.cpp
src/gpu/gl/builders/GrGLProgramBuilder.cpp
src/gpu/gl/builders/GrGLProgramBuilder.h
src/gpu/glsl/GrGLSL.cpp
src/gpu/glsl/GrGLSLFragmentProcessor.h
src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
src/gpu/glsl/GrGLSLPrimitiveProcessor.h
src/gpu/glsl/GrGLSLProgramBuilder.cpp
src/gpu/glsl/GrGLSLProgramBuilder.h
src/gpu/glsl/GrGLSLShaderBuilder.cpp
src/gpu/glsl/GrGLSLVarying.cpp
src/gpu/glsl/GrGLSLXferProcessor.cpp
src/gpu/glsl/GrGLSLXferProcessor.h
src/gpu/instanced/InstanceProcessor.cpp
src/gpu/instanced/InstanceProcessor.h
src/gpu/vk/GrVkCaps.cpp
src/gpu/vk/GrVkCaps.h
src/gpu/vk/GrVkCopyManager.cpp
src/gpu/vk/GrVkPipelineState.cpp
src/gpu/vk/GrVkPipelineState.h
src/gpu/vk/GrVkPipelineStateBuilder.cpp
src/gpu/vk/GrVkPipelineStateBuilder.h
src/gpu/vk/GrVkUniformHandler.cpp
src/sksl/SkSLCompiler.cpp
src/sksl/SkSLCompiler.h
src/sksl/SkSLGLSLCodeGenerator.h
src/sksl/SkSLUtil.h
tests/EGLImageTest.cpp
tests/GLProgramsTest.cpp
tests/ImageStorageTest.cpp
tests/PrimitiveProcessorTest.cpp
tests/SkSLGLSLTest.cpp