Rename GrGLUniformManager to GrGLProgramResourceManager

Rename GrGLUniformManager to GrGLProgramDataManager

Rename GrGLUniformManager to GrGLProgramDataManager in anticipation that the
class would be used to manage shader resources that are not uniforms.

This is needed in order to implement NVPR on GLES.

Committed: https://skia.googlesource.com/skia/+/7510b224e52b9518a8ddf7418db0e9c258f79539

[Kimmo Kinnunen, 2014-07-29 11:57:10]

Brian, so how about this rename? It's a bit of a long identifier, though..

[bsalomon, 2014-07-29 13:08:19]

lgtm (I might have gone with ProgramDataManger but a very weak preference).

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/effects/SkPer...
File src/effects/SkPerlinNoiseShader.cpp (right):

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/effects/SkPer...
src/effects/SkPerlinNoiseShader.cpp:514:
GrGLProgramResourceManager::UniformHandle   fStitchDataUni;
Can you realign these var names?

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
File src/gpu/effects/GrDashingEffect.cpp (right):

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
src/gpu/effects/GrDashingEffect.cpp:484:
GrGLProgramResourceManager::UniformHandle   fParamUniform;
align

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
File src/gpu/effects/GrDistanceFieldTextureEffect.cpp (right):

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
src/gpu/effects/GrDistanceFieldTextureEffect.cpp:160:
GrGLProgramResourceManager::UniformHandle fTextureSizeUni;
align

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
src/gpu/effects/GrDistanceFieldTextureEffect.cpp:425:
GrGLProgramResourceManager::UniformHandle fTextureSizeUni;
align

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
File src/gpu/effects/GrRRectEffect.cpp (right):

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
src/gpu/effects/GrRRectEffect.cpp:502: GrGLProgramResourceManager::UniformHandle
  fInnerRectUniform;
align

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
File src/gpu/effects/GrTextureDomain.h (right):

https://chromiumcodereview.appspot.com/365853002/diff/40001/src/gpu/effects/G...
src/gpu/effects/GrTextureDomain.h:118: GrGLProgramResourceManager::UniformHandle
fDomainUni;
align

[Kimmo Kinnunen, 2014-07-30 06:35:01]

On 2014/07/29 13:08:19, bsalomon wrote:
> lgtm (I might have gone with ProgramDataManger but a very weak preference).

Changed it to GrGLProgramDataManager. Done.

>
https://chromiumcodereview.appspot.com/365853002/diff/40001/src/effects/SkPer...
> File src/effects/SkPerlinNoiseShader.cpp (right):
> 
>
https://chromiumcodereview.appspot.com/365853002/diff/40001/src/effects/SkPer...
> src/effects/SkPerlinNoiseShader.cpp:514:
> GrGLProgramResourceManager::UniformHandle   fStitchDataUni;
> Can you realign these var names?
> 

Done.

Maybe a bit out of line, but still: perhaps it would make sense to document the
use of align whitespace and ascii drawings (lines of slash chars) in the good
coding style doc?

(Should you need input, my preference would be to simplify the formatting a bit)

[Kimmo Kinnunen, 2014-07-30 06:37:43]

The CQ bit was checked by kkinnunen@nvidia.com

[commit-bot: I haz the power, 2014-07-30 06:38:41]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/kkinnunen@nvidia.com/365853002/60001

[commit-bot: I haz the power, 2014-07-30 06:38:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-30 06:38:52]

Failed to apply patch for src/gpu/effects/GrMatrixConvolutionEffect.cpp:
While running git apply --index -p1;
  error: patch failed: src/gpu/effects/GrMatrixConvolutionEffect.cpp:25
  error: src/gpu/effects/GrMatrixConvolutionEffect.cpp: patch does not apply

Patch:       src/gpu/effects/GrMatrixConvolutionEffect.cpp
Index: src/gpu/effects/GrMatrixConvolutionEffect.cpp
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index
283138e1338eeffe7b1fd3d9cb88989dc7ed66ea..54b9eb16c9f9bc3f2f777b7b4b5396840f54ebbb
100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -25,10 +25,10 @@ public:
 
     static inline void GenKey(const GrDrawEffect&, const GrGLCaps&,
GrEffectKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&)
SK_OVERRIDE;
+    virtual void setData(const GrGLProgramDataManager&, const GrDrawEffect&)
SK_OVERRIDE;
 
 private:
-    typedef GrGLUniformManager::UniformHandle        UniformHandle;
+    typedef GrGLProgramDataManager::UniformHandle UniformHandle;
     typedef GrMatrixConvolutionEffect::TileMode TileMode;
     SkISize             fKernelSize;
     TileMode            fTileMode;
@@ -158,7 +158,7 @@ void GrGLMatrixConvolutionEffect::GenKey(const GrDrawEffect&
drawEffect,
     b->add32(key);
 }
 
-void GrGLMatrixConvolutionEffect::setData(const GrGLUniformManager& uman,
+void GrGLMatrixConvolutionEffect::setData(const GrGLProgramDataManager& pdman,
                                           const GrDrawEffect& drawEffect) {
     const GrMatrixConvolutionEffect& conv =
drawEffect.castEffect<GrMatrixConvolutionEffect>();
     GrTexture& texture = *conv.texture(0);
@@ -169,20 +169,20 @@ void GrGLMatrixConvolutionEffect::setData(const
GrGLUniformManager& uman,
     float ySign = texture.origin() == kTopLeft_GrSurfaceOrigin ? 1.0f : -1.0f;
     imageIncrement[0] = 1.0f / texture.width();
     imageIncrement[1] = ySign / texture.height();
-    uman.set2fv(fImageIncrementUni, 1, imageIncrement);
-    uman.set2fv(fKernelOffsetUni, 1, conv.kernelOffset());
-    uman.set1fv(fKernelUni, fKernelSize.width() * fKernelSize.height(),
conv.kernel());
-    uman.set1f(fGainUni, conv.gain());
-    uman.set1f(fBiasUni, conv.bias());
+    pdman.set2fv(fImageIncrementUni, 1, imageIncrement);
+    pdman.set2fv(fKernelOffsetUni, 1, conv.kernelOffset());
+    pdman.set1fv(fKernelUni, fKernelSize.width() * fKernelSize.height(),
conv.kernel());
+    pdman.set1f(fGainUni, conv.gain());
+    pdman.set1f(fBiasUni, conv.bias());
     const SkIRect& bounds = conv.bounds();
     float left = (float) bounds.left() / texture.width();
     float top = (float) bounds.top() / texture.height();
     float right = (float) bounds.right() / texture.width();
     float bottom = (float) bounds.bottom() / texture.height();
     if (texture.origin() == kBottomLeft_GrSurfaceOrigin) {
-        uman.set4f(fBoundsUni, left, 1.0f - bottom, right, 1.0f - top);
+        pdman.set4f(fBoundsUni, left, 1.0f - bottom, right, 1.0f - top);
     } else {
-        uman.set4f(fBoundsUni, left, top, right, bottom);
+        pdman.set4f(fBoundsUni, left, top, right, bottom);
     }
 }

[Kimmo Kinnunen, 2014-07-30 06:50:55]

The CQ bit was checked by kkinnunen@nvidia.com

[commit-bot: I haz the power, 2014-07-30 06:51:43]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/kkinnunen@nvidia.com/365853002/70045

[commit-bot: I haz the power, 2014-07-30 07:04:24]

Change committed as 7510b224e52b9518a8ddf7418db0e9c258f79539