diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-14 18:14:19 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-14 18:14:19 +0000 |
| commit | 7425c124f685978a0a6f0a1f79e89154019e7c99 (patch) | |
| tree | 289904fea2f3fee2c571d39d5acd43959bcd50fb /src/effects/SkMagnifierImageFilter.cpp | |
| parent | 0c0e14c14e24bfe1c7881cf0c31486283de4f652 (diff) | |
Refactor GrGLUniformManager::UniformHandle to initialize itself by default
Refactor GrGLUniformManager::UniformHandle to initialize itself to
"invalid" state by default. This simplifies the effect
constructors. In the future, it should also help catch potential
uninitialized uniform variable usage.
Remove unneeded explicit uniform handle validity assertions before the
handle usage. The assertion will always be made when handle is
converted to index.
BUG=skia:1492
R=bsalomon@google.com
Author: kkinnunen@nvidia.com
Review URL: https://chromiumcodereview.appspot.com/22340010
git-svn-id: http://skia.googlecode.com/svn/trunk@10713 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkMagnifierImageFilter.cpp')
| -rw-r--r-- | src/effects/SkMagnifierImageFilter.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index f7fbda2014..a747620484 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -118,9 +118,6 @@ private: GrGLMagnifierEffect::GrGLMagnifierEffect(const GrBackendEffectFactory& factory, const GrDrawEffect& drawEffect) : INHERITED(factory) - , fOffsetVar(GrGLUniformManager::kInvalidUniformHandle) - , fZoomVar(GrGLUniformManager::kInvalidUniformHandle) - , fInsetVar(GrGLUniformManager::kInvalidUniformHandle) , fEffectMatrix(drawEffect.castEffect<GrMagnifierEffect>().coordsType()) { } |