Refactor GrGLUniformManager::UniformHandle to initialize itself by default

src/gpu/gl/GrGLUniformManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLUniformManager_DEFINED
 #define GrGLUniformManager_DEFINED
 
 #include "gl/GrGLShaderVar.h"
 #include "gl/GrGLSL.h"
 #include "GrAllocator.h"
 
 #include "SkTArray.h"
 
 class GrGLContext;
 class SkMatrix;
 
 /** Manages a program's uniforms.
 */
 class GrGLUniformManager {
 public:
     // Opaque handle to a uniform
-    typedef int UniformHandle;
-    static const UniformHandle kInvalidUniformHandle = 0;
+    class UniformHandle {
+    public:
+        static UniformHandle CreateFromUniformIndex(int i);
+
+        int toUniformIndex() const { GrAssert(isValid()); return ~fHandle; }

[bsalomon, 2013/08/09 13:19:40]

Can we make this private to GrGLUniformManager?

I was thinking either by making it private in UniformHandle and friending
GrGLUniformManager, or by making it a static function of GrGLUniformManager?

The only reason this type really exists is to discourage effect writers from
ever doing their own uploads outside of the manager.

[Kimmo Kinnunen, 2013/08/13 09:00:33]

Done.

+        bool isValid() const { return 0 != fHandle; }
+
+        bool operator==(const UniformHandle& other) const { return other.fHandle == fHandle; }
+
+        UniformHandle()
+            : fHandle(0) {
+        }
+
+    private:
+        UniformHandle(int handle)
+            : fHandle(~handle) {
+            GrAssert(isValid());
+        }
+
+        int fHandle;
+    };
 
     GrGLUniformManager(const GrGLContext& context) : fContext(context) {}
 
     UniformHandle appendUniform(GrSLType type, int arrayCount = GrGLShaderVar::kNonArray);
 
     /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
      *  array of uniforms. offset + arrayCount must be <= the array count of the uniform.
      */
     void setSampler(UniformHandle, GrGLint texUnit) const;
     void set1f(UniformHandle, GrGLfloat v0) const;
@@ skipping 38 matching lines @@
         GrGLint     fFSLocation;
         GrSLType    fType;
         int         fArrayCount;
     };
 
     SkTArray<Uniform, true> fUniforms;
     const GrGLContext&  fContext;
 };
 
 #endif