GrVkGpu initialization cleanup.

src/gpu/vk/GrVkUniformHandler.h

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #ifndef GrVkUniformHandler_DEFINED
 #define GrVkUniformHandler_DEFINED
 
 #include "glsl/GrGLSLUniformHandler.h"
 
 #include "GrAllocator.h"
 #include "glsl/GrGLSLShaderVar.h"
 
-static const int kUniformsPerBlock = 8;
-
 class GrVkUniformHandler : public GrGLSLUniformHandler {
 public:
+    static const int kUniformsPerBlock = 8;
+
     enum {
         kSamplerDescSet = 0,
         kUniformBufferDescSet = 1,
     };
     enum {
         kVertexBinding = 0,
         kFragBinding = 1,
     };
 
     // fUBOffset is only valid if the GrSLType of the fVariable is not a sampler
@@ skipping 45 matching lines @@
     UniformInfoArray fUniforms;
     uint32_t         fCurrentVertexUBOOffset;
     uint32_t         fCurrentFragmentUBOOffset;
     uint32_t         fCurrentSamplerBinding;
 
     friend class GrVkProgramBuilder;
 
     typedef GrGLSLUniformHandler INHERITED;
 };
 
-#endif
+#endif