Correctly handle mat2x2 in Vulkan

src/gpu/vk/GrVkPipelineStateDataManager.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "GrVkPipelineStateDataManager.h"
 
 #include "GrVkGpu.h"
@@ skipping 215 matching lines @@
 
     set_uniform_matrix<N>::set(buffer, uni.fOffset, arrayCount, matrices);
 }
 
 template<int N> struct set_uniform_matrix {
     inline static void set(void* buffer, int uniformOffset, int count, const float matrices[]) {
         GR_STATIC_ASSERT(sizeof(float) == 4);
         buffer = static_cast<char*>(buffer) + uniformOffset;
         for (int i = 0; i < count; ++i) {
             const float* matrix = &matrices[N * N * i];
-            memcpy(buffer, &matrix[0], N * sizeof(float));
-            buffer = static_cast<char*>(buffer) + 4*sizeof(float);
-            memcpy(buffer, &matrix[3], N * sizeof(float));
-            buffer = static_cast<char*>(buffer) + 4*sizeof(float);
-            memcpy(buffer, &matrix[6], N * sizeof(float));
-            buffer = static_cast<char*>(buffer) + 4*sizeof(float);
+            for (int j = 0; j < N; ++j) {
+                memcpy(buffer, &matrix[j * N], N * sizeof(float));
+                buffer = static_cast<char*>(buffer) + 4 * sizeof(float);
+            }
         }
     }
 };
 
 template<> struct set_uniform_matrix<4> {
     inline static void set(void* buffer, int uniformOffset, int count, const float matrices[]) {
         GR_STATIC_ASSERT(sizeof(float) == 4);
         buffer = static_cast<char*>(buffer) + uniformOffset;
         memcpy(buffer, matrices, count * 16 * sizeof(float));
     }
 };
 
 bool GrVkPipelineStateDataManager::uploadUniformBuffers(GrVkGpu* gpu,
                                                         GrVkUniformBuffer* vertexBuffer,
                                                         GrVkUniformBuffer* fragmentBuffer) const {
     bool updatedBuffer = false;
     if (vertexBuffer && fVertexUniformsDirty) {
         SkAssertResult(vertexBuffer->updateData(gpu, fVertexUniformData.get(), fVertexUniformSize,
                                                 &updatedBuffer));
         fVertexUniformsDirty = false;
     }
 
     if (fragmentBuffer && fFragmentUniformsDirty) {
         SkAssertResult(fragmentBuffer->updateData(gpu, fFragmentUniformData.get(),
                                                   fFragmentUniformSize, &updatedBuffer));
         fFragmentUniformsDirty = false;
     }
     return updatedBuffer;
 }