Add support for 2x2 matrices

src/gpu/vk/GrVkUniformHandler.cpp

Index: src/gpu/vk/GrVkUniformHandler.cpp
diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index 55b41abf49c64197489825dc4e02dacfdf38dedc..fff7dfe8739d46717ccba8c099f97d8f37344ddc 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -22,6 +22,7 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
         0x7, // kVec2f_GrSLType
         0xF, // kVec3f_GrSLType
         0xF, // kVec4f_GrSLType
+        0xF, // kMat22f_GrSLType

[egdaniel, 2016/03/07 18:51:26]

so this function technically returns things in std430 layout. Which means for
arrays (which a matrix is) it is the alignment of the column vecs, so the
alignment of a vec2. Thus the alignment for a mat22f would be 8 bytes and thus a
mask of 0x7.

[egdaniel, 2016/03/07 21:20:03]

Can you just make this change 0x7

[Chris Dalton, 2016/03/07 22:17:12]

Done.

         0xF, // kMat33f_GrSLType
         0xF, // kMat44f_GrSLType
         0x0, // Sampler2D_GrSLType, should never return this
@@ -32,10 +33,11 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
     GR_STATIC_ASSERT(2 == kVec2f_GrSLType);
     GR_STATIC_ASSERT(3 == kVec3f_GrSLType);
     GR_STATIC_ASSERT(4 == kVec4f_GrSLType);
-    GR_STATIC_ASSERT(5 == kMat33f_GrSLType);
-    GR_STATIC_ASSERT(6 == kMat44f_GrSLType);
-    GR_STATIC_ASSERT(7 == kSampler2D_GrSLType);
-    GR_STATIC_ASSERT(8 == kSamplerExternal_GrSLType);
+    GR_STATIC_ASSERT(5 == kMat22f_GrSLType);
+    GR_STATIC_ASSERT(6 == kMat33f_GrSLType);
+    GR_STATIC_ASSERT(7 == kMat44f_GrSLType);
+    GR_STATIC_ASSERT(8 == kSampler2D_GrSLType);
+    GR_STATIC_ASSERT(9 == kSamplerExternal_GrSLType);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kAlignments) == kGrSLTypeCount);
     return kAlignments[type];
 }
@@ -50,6 +52,7 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) {
         2 * sizeof(float),        // kVec2f_GrSLType
         3 * sizeof(float),        // kVec3f_GrSLType
         4 * sizeof(float),        // kVec4f_GrSLType
+        8 * sizeof(float),        // kMat22f_GrSLType

[egdaniel, 2016/03/07 18:51:26]

This function may need some reworking since we have decide what we mean by size.
The size of a mat2x2 in a uniform buffer, std140 layout, will be 2*
sizeof(vec4). In a push constant buffer, std430 layout, it will be 2 *
sizeof(vec2). This is one of the reasons I was saying adding a 2x2 matrix makes
things more complicated here. For a Mat3x3 (and thus a column of vec3), always
acts like a vec4.

So either we need to make 2 different size helper functions, or we need a way to
pass in some variable to this function so it knows what the size of a matrix
column should be.

[egdaniel, 2016/03/07 21:20:03]

Just add a comment after Mat22f_GrSLType saying something along the lines that
this needs to be fixed

[Chris Dalton, 2016/03/07 22:17:12]

Done.

         12 * sizeof(float),       // kMat33f_GrSLType
         16 * sizeof(float),       // kMat44f_GrSLType
         0,                        // kSampler2D_GrSLType
@@ -66,15 +69,16 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) {
     GR_STATIC_ASSERT(2 == kVec2f_GrSLType);
     GR_STATIC_ASSERT(3 == kVec3f_GrSLType);
     GR_STATIC_ASSERT(4 == kVec4f_GrSLType);
-    GR_STATIC_ASSERT(5 == kMat33f_GrSLType);
-    GR_STATIC_ASSERT(6 == kMat44f_GrSLType);
-    GR_STATIC_ASSERT(7 == kSampler2D_GrSLType);
-    GR_STATIC_ASSERT(8 == kSamplerExternal_GrSLType);
-    GR_STATIC_ASSERT(9 == kSampler2DRect_GrSLType);
-    GR_STATIC_ASSERT(10 == kBool_GrSLType);
-    GR_STATIC_ASSERT(11 == kInt_GrSLType);
-    GR_STATIC_ASSERT(12 == kUint_GrSLType);
-    GR_STATIC_ASSERT(13 == kGrSLTypeCount);
+    GR_STATIC_ASSERT(5 == kMat22f_GrSLType);
+    GR_STATIC_ASSERT(6 == kMat33f_GrSLType);
+    GR_STATIC_ASSERT(7 == kMat44f_GrSLType);
+    GR_STATIC_ASSERT(8 == kSampler2D_GrSLType);
+    GR_STATIC_ASSERT(9 == kSamplerExternal_GrSLType);
+    GR_STATIC_ASSERT(10 == kSampler2DRect_GrSLType);
+    GR_STATIC_ASSERT(11 == kBool_GrSLType);
+    GR_STATIC_ASSERT(12 == kInt_GrSLType);
+    GR_STATIC_ASSERT(13 == kUint_GrSLType);
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kSizes) == kGrSLTypeCount);
 }