Completed matrix access tests

test/gtc/gtc_matrix_access.cpp

@@ -10,40 +10,272 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_access.hpp>
 
-int test_mat4x4_row_get()
+int test_mat2x2_row_set()
 {
     int Error = 0;
     
-    glm::mat4 m(1);
+    glm::mat2x2 m(1);
     
-    glm::vec4 A = glm::row(m, 0);
-    Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1;
-    glm::vec4 B = glm::row(m, 0);
-    Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1;
-    glm::vec4 C = glm::row(m, 0);
-    Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1;
-    glm::vec4 D = glm::row(m, 0);
-    Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1;
+	glm::row(m, 0, glm::vec2( 0,  1));
+	glm::row(m, 1, glm::vec2( 4,  5));
+
+    Error += glm::row(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
 
     return Error;
 }
 
-int test_mat4x4_col_get()
+int test_mat2x2_col_set()
 {
     int Error = 0;
     
-    glm::mat4 m(1);
+    glm::mat2x2 m(1);
     
-    glm::vec4 A = glm::column(m, 0);
-    Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1;
-    glm::vec4 B = glm::column(m, 0);
-    Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1;
-    glm::vec4 C = glm::column(m, 0);
-    Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1;
-    glm::vec4 D = glm::column(m, 0);
-    Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1;
+	glm::column(m, 0, glm::vec2( 0,  1));
+	glm::column(m, 1, glm::vec2( 4,  5));
+
+    Error += glm::column(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat2x3_row_set()
+{
+    int Error = 0;
     
-    return Error;    
+    glm::mat2x3 m(1);
+    
+	glm::row(m, 0, glm::vec2( 0,  1));
+	glm::row(m, 1, glm::vec2( 4,  5));
+	glm::row(m, 2, glm::vec2( 8,  9));
+
+    Error += glm::row(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
+    Error += glm::row(m, 2) == glm::vec2( 8,  9) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat2x3_col_set()
+{
+    int Error = 0;
+    
+    glm::mat2x3 m(1);
+    
+	glm::column(m, 0, glm::vec3( 0,  1,  2));
+	glm::column(m, 1, glm::vec3( 4,  5,  6));
+
+    Error += glm::column(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat2x4_row_set()
+{
+    int Error = 0;
+    
+    glm::mat2x4 m(1);
+    
+	glm::row(m, 0, glm::vec2( 0,  1));
+	glm::row(m, 1, glm::vec2( 4,  5));
+	glm::row(m, 2, glm::vec2( 8,  9));
+	glm::row(m, 3, glm::vec2(12, 13));
+
+    Error += glm::row(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
+    Error += glm::row(m, 2) == glm::vec2( 8,  9) ? 0 : 1;
+	Error += glm::row(m, 2) == glm::vec2(12, 13) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat2x4_col_set()
+{
+    int Error = 0;
+    
+    glm::mat2x4 m(1);
+    
+	glm::column(m, 0, glm::vec4( 0,  1,  2, 3));
+	glm::column(m, 1, glm::vec4( 4,  5,  6, 7));
+
+    Error += glm::column(m, 0) == glm::vec4( 0,  1,  2, 3) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec4( 4,  5,  6, 7) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat3x2_row_set()
+{
+    int Error = 0;
+    
+    glm::mat3x2 m(1);
+    
+	glm::row(m, 0, glm::vec3( 0,  1,  2));
+	glm::row(m, 1, glm::vec3( 4,  5,  6));
+
+    Error += glm::row(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat3x2_col_set()
+{
+    int Error = 0;
+    
+    glm::mat3x2 m(1);
+    
+	glm::column(m, 0, glm::vec2( 0,  1));
+	glm::column(m, 1, glm::vec2( 4,  5));
+	glm::column(m, 2, glm::vec2( 8,  9));
+
+    Error += glm::column(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
+    Error += glm::column(m, 2) == glm::vec2( 8,  9) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat3x3_row_set()
+{
+    int Error = 0;
+    
+    glm::mat3x3 m(1);
+    
+	glm::row(m, 0, glm::vec3( 0,  1,  2));
+	glm::row(m, 1, glm::vec3( 4,  5,  6));
+	glm::row(m, 2, glm::vec3( 8,  9, 10));
+
+    Error += glm::row(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
+    Error += glm::row(m, 2) == glm::vec3( 8,  9, 10) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat3x3_col_set()
+{
+    int Error = 0;
+    
+    glm::mat3x3 m(1);
+    
+	glm::column(m, 0, glm::vec3( 0,  1,  2));
+	glm::column(m, 1, glm::vec3( 4,  5,  6));
+	glm::column(m, 2, glm::vec3( 8,  9, 10));
+
+    Error += glm::column(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
+    Error += glm::column(m, 2) == glm::vec3( 8,  9, 10) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat3x4_row_set()
+{
+    int Error = 0;
+    
+    glm::mat3x4 m(1);
+    
+	glm::row(m, 0, glm::vec3( 0,  1,  2));
+	glm::row(m, 1, glm::vec3( 4,  5,  6));
+	glm::row(m, 2, glm::vec3( 8,  9, 10));
+	glm::row(m, 3, glm::vec3(12, 13, 14));
+
+    Error += glm::row(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
+    Error += glm::row(m, 2) == glm::vec3( 8,  9, 10) ? 0 : 1;
+	Error += glm::row(m, 3) == glm::vec3(12, 13, 14) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat3x4_col_set()
+{
+    int Error = 0;
+    
+    glm::mat3x4 m(1);
+    
+	glm::column(m, 0, glm::vec4( 0,  1,  2, 3));
+	glm::column(m, 1, glm::vec4( 4,  5,  6, 7));
+	glm::column(m, 2, glm::vec4( 8,  9, 10, 11));
+
+    Error += glm::column(m, 0) == glm::vec4( 0,  1,  2, 3) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec4( 4,  5,  6, 7) ? 0 : 1;
+    Error += glm::column(m, 2) == glm::vec4( 8,  9, 10, 11) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat4x2_row_set()
+{
+    int Error = 0;
+    
+    glm::mat4x2 m(1);
+    
+	glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
+	glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
+
+    Error += glm::row(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat4x2_col_set()
+{
+    int Error = 0;
+    
+    glm::mat4x2 m(1);
+    
+	glm::column(m, 0, glm::vec2( 0,  1));
+	glm::column(m, 1, glm::vec2( 4,  5));
+	glm::column(m, 2, glm::vec2( 8,  9));
+	glm::column(m, 3, glm::vec2(12, 13));
+
+    Error += glm::column(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
+    Error += glm::column(m, 2) == glm::vec2( 8,  9) ? 0 : 1;
+    Error += glm::column(m, 3) == glm::vec2(12, 13) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat4x3_row_set()
+{
+    int Error = 0;
+    
+    glm::mat4x3 m(1);
+    
+	glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
+	glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
+	glm::row(m, 2, glm::vec4( 8,  9, 10, 11));
+
+    Error += glm::row(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
+    Error += glm::row(m, 2) == glm::vec4( 8,  9, 10, 11) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat4x3_col_set()
+{
+    int Error = 0;
+    
+    glm::mat4x3 m(1);
+    
+	glm::column(m, 0, glm::vec3( 0,  1,  2));
+	glm::column(m, 1, glm::vec3( 4,  5,  6));
+	glm::column(m, 2, glm::vec3( 8,  9, 10));
+	glm::column(m, 3, glm::vec3(12, 13, 14));
+
+    Error += glm::column(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
+    Error += glm::column(m, 2) == glm::vec3( 8,  9, 10) ? 0 : 1;
+    Error += glm::column(m, 3) == glm::vec3(12, 13, 14) ? 0 : 1;
+
+    return Error;
 }
 
 int test_mat4x4_row_set()
@@ -58,9 +290,9 @@ int test_mat4x4_row_set()
 	glm::row(m, 3, glm::vec4(12, 13, 14, 15));
 
     Error += glm::row(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
-    Error += glm::row(m, 0) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
-    Error += glm::row(m, 0) == glm::vec4( 8,  9, 10, 11) ? 0 : 1;
-    Error += glm::row(m, 0) == glm::vec4(12, 13, 14, 15) ? 0 : 1;
+    Error += glm::row(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
+    Error += glm::row(m, 2) == glm::vec4( 8,  9, 10, 11) ? 0 : 1;
+    Error += glm::row(m, 3) == glm::vec4(12, 13, 14, 15) ? 0 : 1;
 
     return Error;
 }
@@ -77,21 +309,74 @@ int test_mat4x4_col_set()
 	glm::column(m, 3, glm::vec4(12, 13, 14, 15));
 
     Error += glm::column(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
-    Error += glm::column(m, 0) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
-    Error += glm::column(m, 0) == glm::vec4( 8,  9, 10, 11) ? 0 : 1;
-    Error += glm::column(m, 0) == glm::vec4(12, 13, 14, 15) ? 0 : 1;
+    Error += glm::column(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
+    Error += glm::column(m, 2) == glm::vec4( 8,  9, 10, 11) ? 0 : 1;
+    Error += glm::column(m, 3) == glm::vec4(12, 13, 14, 15) ? 0 : 1;
+
+    return Error;
+}
+
+int test_mat4x4_row_get()
+{
+    int Error = 0;
+    
+    glm::mat4 m(1);
+    
+    glm::vec4 A = glm::row(m, 0);
+    Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1;
+    glm::vec4 B = glm::row(m, 1);
+    Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1;
+    glm::vec4 C = glm::row(m, 2);
+    Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1;
+    glm::vec4 D = glm::row(m, 3);
+    Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1;
 
     return Error;
 }
 
+int test_mat4x4_col_get()
+{
+    int Error = 0;
+    
+    glm::mat4 m(1);
+    
+    glm::vec4 A = glm::column(m, 0);
+    Error += A == glm::vec4(1, 0, 0, 0) ? 0 : 1;
+    glm::vec4 B = glm::column(m, 1);
+    Error += B == glm::vec4(0, 1, 0, 0) ? 0 : 1;
+    glm::vec4 C = glm::column(m, 2);
+    Error += C == glm::vec4(0, 0, 1, 0) ? 0 : 1;
+    glm::vec4 D = glm::column(m, 3);
+    Error += D == glm::vec4(0, 0, 0, 1) ? 0 : 1;
+    
+    return Error;    
+}
+
 int main()
 {
 	int Error = 0;
 
+	Error += test_mat2x2_row_set();
+    Error += test_mat2x2_col_set();
+	Error += test_mat2x3_row_set();
+    Error += test_mat2x3_col_set();
+	Error += test_mat2x4_row_set();
+    Error += test_mat2x4_col_set();
+	Error += test_mat3x2_row_set();
+    Error += test_mat3x2_col_set();
+	Error += test_mat3x3_row_set();
+    Error += test_mat3x3_col_set();
+	Error += test_mat3x4_row_set();
+    Error += test_mat3x4_col_set();
+	Error += test_mat4x2_row_set();
+    Error += test_mat4x2_col_set();
+	Error += test_mat4x3_row_set();
+    Error += test_mat4x3_col_set();
+	Error += test_mat4x4_row_set();
+    Error += test_mat4x4_col_set();
+
     Error += test_mat4x4_row_get();
     Error += test_mat4x4_col_get();
-    Error += test_mat4x4_row_set();
-    Error += test_mat4x4_col_set();
-    
+
 	return Error;
 }