Merge GrGLSLShaderVar and GrShaderVar
authorBrian Salomon <bsalomon@google.com>
Mon, 21 Nov 2016 18:41:08 +0000 (13:41 -0500)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Mon, 21 Nov 2016 19:13:43 +0000 (19:13 +0000)
commit99938a8ef24e2dd5b39f78638742e9b50ab6d9bf
treee3842210db20a4574e9cec37ae7f049aaff27b65
parentd728f0c1a94fe926b59d8ebc9ae174019ccd3606
Merge GrGLSLShaderVar and GrShaderVar

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

Change-Id: Ib8943a1da1ea495554feaf5b0992b94fbb9539ab
Reviewed-on: https://skia-review.googlesource.com/5087
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
55 files changed:
bench/GLInstancedArraysBench.cpp
bench/GLVec4ScalarBench.cpp
bench/GLVertexAttributesBench.cpp
experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp
gn/gpu.gni
include/gpu/GrShaderVar.h
src/effects/GrAlphaThresholdFragmentProcessor.cpp
src/effects/SkBlurMaskFilter.cpp
src/effects/SkLightingImageFilter.cpp
src/effects/SkMagnifierImageFilter.cpp
src/effects/SkMorphologyImageFilter.cpp
src/effects/SkPerlinNoiseShader.cpp
src/effects/gradients/SkGradientShader.cpp
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
src/gpu/GrOvalRenderer.cpp
src/gpu/GrShaderVar.cpp [new file with mode: 0644]
src/gpu/batches/GrPLSPathRenderer.cpp
src/gpu/effects/GrBezierEffect.cpp
src/gpu/effects/GrBicubicEffect.cpp
src/gpu/effects/GrConfigConversionEffect.cpp
src/gpu/effects/GrConvexPolyEffect.cpp
src/gpu/effects/GrConvolutionEffect.cpp
src/gpu/effects/GrDitherEffect.cpp
src/gpu/effects/GrGammaEffect.cpp
src/gpu/effects/GrMatrixConvolutionEffect.cpp
src/gpu/effects/GrOvalEffect.cpp
src/gpu/effects/GrRRectEffect.cpp
src/gpu/effects/GrTextureDomain.cpp
src/gpu/gl/GrGLGpu.cpp
src/gpu/gl/GrGLProgramDataManager.cpp
src/gpu/gl/GrGLProgramDataManager.h
src/gpu/gl/GrGLTexture.cpp
src/gpu/gl/GrGLUniformHandler.cpp
src/gpu/gl/GrGLUniformHandler.h
src/gpu/glsl/GrGLSLBlend.cpp
src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
src/gpu/glsl/GrGLSLProgramBuilder.cpp
src/gpu/glsl/GrGLSLProgramBuilder.h
src/gpu/glsl/GrGLSLShaderBuilder.cpp
src/gpu/glsl/GrGLSLShaderBuilder.h
src/gpu/glsl/GrGLSLShaderVar.h [deleted file]
src/gpu/glsl/GrGLSLUniformHandler.h
src/gpu/glsl/GrGLSLVarying.cpp
src/gpu/glsl/GrGLSLVarying.h
src/gpu/glsl/GrGLSLXferProcessor.cpp
src/gpu/instanced/InstanceProcessor.cpp
src/gpu/vk/GrVkCopyManager.cpp
src/gpu/vk/GrVkPipelineStateBuilder.cpp
src/gpu/vk/GrVkPipelineStateBuilder.h
src/gpu/vk/GrVkPipelineStateDataManager.cpp
src/gpu/vk/GrVkUniformHandler.cpp
src/gpu/vk/GrVkUniformHandler.h
src/gpu/vk/GrVkVaryingHandler.cpp
tests/EGLImageTest.cpp