|
Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly
GrGLUniformManager served two purposes: provide context to the uniform
data setters and a uniform list for a linked GrGLProgram. The context
to the data setting is more naturally passed as GrGLContext, and
the list can be stored directly in GrGLProgram.
Before, the lexical uniforms were ref'ed by indexing
GrGLShaderBuilder::fUniforms and the symbolic uniforms by
GrGLUniformManager::fUniforms.
Move lexical information about program uniforms to
GrGLShaderBuilder::Uniform and symbolic information about uniforms to
GrGLUniform.
BUG= skia:1492
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+920 lines, -929 lines) |
Patch |
 |
M |
gyp/gpu.gypi
|
View
|
|
1 chunk |
+2 lines, -3 lines |
0 comments
|
Download
|
 |
M |
src/core/SkXfermode.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkArithmeticMode.cpp
|
View
|
|
3 chunks |
+10 lines, -8 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkBicubicImageFilter.cpp
|
View
|
|
5 chunks |
+19 lines, -17 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkColorMatrixFilter.cpp
|
View
|
|
4 chunks |
+22 lines, -16 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkDisplacementMapEffect.cpp
|
View
|
|
5 chunks |
+10 lines, -10 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkLightingImageFilter.cpp
|
View
|
|
24 chunks |
+98 lines, -96 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkMagnifierImageFilter.cpp
|
View
|
|
5 chunks |
+25 lines, -22 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkMatrixConvolutionImageFilter.cpp
|
View
|
|
6 chunks |
+46 lines, -36 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkMorphologyImageFilter.cpp
|
View
|
|
6 chunks |
+13 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkPerlinNoiseShader.cpp
|
View
|
|
12 chunks |
+60 lines, -54 lines |
0 comments
|
Download
|
 |
M |
src/effects/SkTableColorFilter.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
src/effects/gradients/SkGradientShader.cpp
|
View
|
|
3 chunks |
+12 lines, -8 lines |
0 comments
|
Download
|
 |
M |
src/effects/gradients/SkGradientShaderPriv.h
|
View
|
|
3 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
 |
M |
src/effects/gradients/SkLinearGradient.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/effects/gradients/SkRadialGradient.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/effects/gradients/SkSweepGradient.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/effects/gradients/SkTwoPointConicalGradient.cpp
|
View
|
|
10 chunks |
+32 lines, -30 lines |
0 comments
|
Download
|
 |
M |
src/effects/gradients/SkTwoPointRadialGradient.cpp
|
View
|
|
9 chunks |
+28 lines, -27 lines |
0 comments
|
Download
|
 |
M |
src/gpu/GrAAConvexPathRenderer.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
src/gpu/GrAAHairLinePathRenderer.cpp
|
View
|
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
src/gpu/GrAARectRenderer.cpp
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/gpu/GrOvalRenderer.cpp
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/gpu/effects/GrConfigConversionEffect.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/gpu/effects/GrConvolutionEffect.cpp
|
View
|
|
7 chunks |
+32 lines, -29 lines |
0 comments
|
Download
|
 |
M |
src/gpu/effects/GrSimpleTextureEffect.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
src/gpu/effects/GrTextureDomainEffect.cpp
|
View
|
|
5 chunks |
+7 lines, -7 lines |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLEffect.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLEffect.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLEffectMatrix.h
|
View
|
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLEffectMatrix.cpp
|
View
|
|
4 chunks |
+5 lines, -6 lines |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLProgram.h
|
View
|
|
3 chunks |
+33 lines, -25 lines |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLProgram.cpp
|
View
|
|
18 chunks |
+45 lines, -51 lines |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLShaderBuilder.h
|
View
|
|
14 chunks |
+51 lines, -38 lines |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGLShaderBuilder.cpp
|
View
|
|
14 chunks |
+30 lines, -34 lines |
0 comments
|
Download
|
 |
A |
src/gpu/gl/GrGLUniform.h
|
View
|
|
1 chunk |
+74 lines, -0 lines |
0 comments
|
Download
|
 |
A |
src/gpu/gl/GrGLUniform.cpp
|
View
|
|
1 chunk |
+236 lines, -0 lines |
0 comments
|
Download
|
 |
D |
src/gpu/gl/GrGLUniformHandle.h
|
View
|
|
1 chunk |
+0 lines, -16 lines |
0 comments
|
Download
|
 |
D |
src/gpu/gl/GrGLUniformManager.h
|
View
|
|
1 chunk |
+0 lines, -84 lines |
0 comments
|
Download
|
 |
D |
src/gpu/gl/GrGLUniformManager.cpp
|
View
|
|
1 chunk |
+0 lines, -269 lines |
0 comments
|
Download
|
 |
M |
src/gpu/gl/GrGpuGL_program.cpp
|
View
|
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
|