GrVkGpu initialization cleanup.

src/gpu/gl/GrGLUniformHandler.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLUniformHandler_DEFINED
 #define GrGLUniformHandler_DEFINED
 
 #include "glsl/GrGLSLUniformHandler.h"
 
 #include "gl/GrGLProgramDataManager.h"
 
 class GrGLCaps;
 
-static const int kUniformsPerBlock = 8;
-
 class GrGLUniformHandler : public GrGLSLUniformHandler {
 public:
+    static const int kUniformsPerBlock = 8;
+
     const GrGLSLShaderVar& getUniformVariable(UniformHandle u) const override {
         return fUniforms[u.toIndex()].fVariable;
     }
 
     const char* getUniformCStr(UniformHandle u) const override {
         return this->getUniformVariable(u).c_str();
     }
 private:
     explicit GrGLUniformHandler(GrGLSLProgramBuilder* program)
         : INHERITED(program)
@@ skipping 21 matching lines @@
     typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
 
     UniformInfoArray fUniforms;
 
     friend class GrGLProgramBuilder;
 
     typedef GrGLSLUniformHandler INHERITED; 
 };
 
 #endif