Merge lp:~jammy-zhou/glcompbench/glcompbench into lp:glcompbench

[Jammy Zhou]

[Jesse Barker (jesse-barker)]

As discussed previously, I'm concerned that the actual and advertised behavior of libmatrix in these changes are consistent (and that cases apart from the ones being exercised in the current state of glcompbench are satisfied). I've pushed a new version of libmatrix that provides column-major data to the API, but a row-major interface to the programmer (IMHO, much more intuitive). The result is that rebranching the instance of libmatrix in glcompbench would require only changing the transpose parameter to glUniformMatrix4fv().

cheers,
jesse

review: Disapprove

Unmerged revisions

14. By Jammy Zhou on 2011-04-13

The transpose parameter of glUniformMatrix4fv must be GL_FALSE for GLES2

If GL_TRUE is set, GL_ERROR_INVALID_VALUE will be returned. So use column
major order for matrix transformations.

=== modified file 'src/libmatrix/mat.cc'
--- src/libmatrix/mat.cc	2011-01-17 18:15:21 +0000
+++ src/libmatrix/mat.cc	2011-04-13 01:40:50 +0000
@@ -21,9 +21,9 @@
 translate(float x, float y, float z)
 {
     mat4 t;
-    t[0][3] = x;
-    t[1][3] = y;
-    t[2][3] = z;
+    t[3][0] = x;
+    t[3][1] = y;
+    t[3][2] = z;
     return t;
 }
 
@@ -61,13 +61,13 @@
     mat3 uuT = outer(u, u);
     mat3 s;   
     s[0][0] = 0;
-    s[0][1] = -u.z();
-    s[0][2] = u.y();
-    s[1][0] = u.z();
+    s[1][0] = -u.z();
+    s[2][0] = u.y();
+    s[0][1] = u.z();
     s[1][1] = 0;
-    s[1][2] = -u.x();
-    s[2][0] = -u.y();
-    s[2][1] = u.x();
+    s[2][1] = -u.x();
+    s[0][2] = -u.y();
+    s[1][2] = u.x();
     s[2][2] = 0;
     mat3 i;
     i -= uuT;
@@ -99,12 +99,12 @@
     float depth(far - near);
     mat4 f;
     f[0][0] = twiceNear / width;
-    f[0][2] = (right + left) / width;
+    f[2][0] = (right + left) / width;
     f[1][1] = twiceNear / height;
-    f[1][2] = (top + bottom) / height;
+    f[2][1] = (top + bottom) / height;
     f[2][2] = -(far + near) / depth;
-    f[2][3] = -(twiceNear * far) / depth;
-    f[3][2] = -1;
+    f[3][2] = -(twiceNear * far) / depth;
+    f[2][3] = -1;
     f[3][3] = 0;
     return f;
 }
@@ -117,11 +117,11 @@
     float depth(far - near);
     mat4 o;
     o[0][0] = 2 / width;
-    o[0][3] = (right + left) / width;
+    o[3][0] = (right + left) / width;
     o[1][1] = 2 / height;
-    o[1][3] = (top + bottom) / height;
+    o[3][1] = (top + bottom) / height;
     o[2][2] = -2 / depth;
-    o[2][3] = (far + near) / depth;
+    o[3][2] = (far + near) / depth;
     return o;
 }
 
@@ -137,8 +137,8 @@
     p[0][0] = f / aspect;
     p[1][1] = f;
     p[2][2] = (zFar + zNear) / depth;
-    p[2][3] = (2 * zFar * zNear) / depth;
-    p[3][2] = -1;
+    p[3][2] = (2 * zFar * zNear) / depth;
+    p[2][3] = -1;
     p[3][3] = 0;
     return p;
 }
@@ -156,13 +156,13 @@
     u.normalize();
     mat4 la;
     la[0][0] = s.x();
-    la[0][1] = s.y();
-    la[0][2] = s.z();
-    la[1][0] = u.x();
+    la[1][0] = s.y();
+    la[2][0] = s.z();
+    la[0][1] = u.x();
     la[1][1] = u.y();
-    la[1][2] = u.z();
-    la[2][0] = -f.x();
-    la[2][1] = -f.y();
+    la[2][1] = u.z();
+    la[0][2] = -f.x();
+    la[1][2] = -f.y();
     la[2][2] = -f.z();
     la *= translate(-eyeX, -eyeY, -eyeZ);
     return la;

=== modified file 'src/libmatrix/mat.h'
--- src/libmatrix/mat.h	2011-01-17 18:15:21 +0000
+++ src/libmatrix/mat.h	2011-04-13 01:40:50 +0000
@@ -601,22 +601,23 @@
 
     tmat4& operator*=(const tmat4& rhs)
     {
-        T r0c0((m_[0] * rhs.m_[0]) + (m_[1] * rhs.m_[4]) + (m_[2] * rhs.m_[8]) + (m_[3] * rhs.m_[12]));
-        T r0c1((m_[0] * rhs.m_[1]) + (m_[1] * rhs.m_[5]) + (m_[2] * rhs.m_[9]) + (m_[3] * rhs.m_[13]));
-        T r0c2((m_[0] * rhs.m_[2]) + (m_[1] * rhs.m_[6]) + (m_[2] * rhs.m_[10]) + (m_[3] * rhs.m_[14]));
-        T r0c3((m_[0] * rhs.m_[3]) + (m_[1] * rhs.m_[7]) + (m_[2] * rhs.m_[11]) + (m_[3] * rhs.m_[15]));
-        T r1c0((m_[4] * rhs.m_[0]) + (m_[5] * rhs.m_[4]) + (m_[6] * rhs.m_[8]) + (m_[7] * rhs.m_[12]));
-        T r1c1((m_[4] * rhs.m_[1]) + (m_[5] * rhs.m_[5]) + (m_[6] * rhs.m_[9]) + (m_[7] * rhs.m_[13]));
-        T r1c2((m_[4] * rhs.m_[2]) + (m_[5] * rhs.m_[6]) + (m_[6] * rhs.m_[10]) + (m_[7] * rhs.m_[14]));
-        T r1c3((m_[4] * rhs.m_[3]) + (m_[5] * rhs.m_[7]) + (m_[6] * rhs.m_[11]) + (m_[7] * rhs.m_[15]));
-        T r2c0((m_[8] * rhs.m_[0]) + (m_[9] * rhs.m_[4]) + (m_[10] * rhs.m_[8]) + (m_[11] * rhs.m_[12]));
-        T r2c1((m_[8] * rhs.m_[1]) + (m_[9] * rhs.m_[5]) + (m_[10] * rhs.m_[9]) + (m_[11] * rhs.m_[13]));
-        T r2c2((m_[8] * rhs.m_[2]) + (m_[9] * rhs.m_[6]) + (m_[10] * rhs.m_[10]) + (m_[11] * rhs.m_[14]));
-        T r2c3((m_[8] * rhs.m_[3]) + (m_[9] * rhs.m_[7]) + (m_[10] * rhs.m_[11]) + (m_[11] * rhs.m_[15]));
-        T r3c0((m_[12] * rhs.m_[0]) + (m_[13] * rhs.m_[4]) + (m_[14] * rhs.m_[8]) + (m_[15] * rhs.m_[12]));
-        T r3c1((m_[12] * rhs.m_[1]) + (m_[13] * rhs.m_[5]) + (m_[14] * rhs.m_[9]) + (m_[15] * rhs.m_[13]));
-        T r3c2((m_[12] * rhs.m_[2]) + (m_[13] * rhs.m_[6]) + (m_[14] * rhs.m_[10]) + (m_[15] * rhs.m_[14]));
-        T r3c3((m_[12] * rhs.m_[3]) + (m_[13] * rhs.m_[7]) + (m_[14] * rhs.m_[11]) + (m_[15] * rhs.m_[15]));
+        T r0c0((rhs.m_[0] * m_[0]) + (rhs.m_[1] * m_[4]) + (rhs.m_[2] * m_[8]) + (rhs.m_[3] * m_[12]));
+        T r0c1((rhs.m_[0] * m_[1]) + (rhs.m_[1] * m_[5]) + (rhs.m_[2] * m_[9]) + (rhs.m_[3] * m_[13]));
+        T r0c2((rhs.m_[0] * m_[2]) + (rhs.m_[1] * m_[6]) + (rhs.m_[2] * m_[10]) + (rhs.m_[3] * m_[14]));
+        T r0c3((rhs.m_[0] * m_[3]) + (rhs.m_[1] * m_[7]) + (rhs.m_[2] * m_[11]) + (rhs.m_[3] * m_[15]));
+        T r1c0((rhs.m_[4] * m_[0]) + (rhs.m_[5] * m_[4]) + (rhs.m_[6] * m_[8]) + (rhs.m_[7] * m_[12]));
+        T r1c1((rhs.m_[4] * m_[1]) + (rhs.m_[5] * m_[5]) + (rhs.m_[6] * m_[9]) + (rhs.m_[7] * m_[13]));
+        T r1c2((rhs.m_[4] * m_[2]) + (rhs.m_[5] * m_[6]) + (rhs.m_[6] * m_[10]) + (rhs.m_[7] * m_[14]));
+        T r1c3((rhs.m_[4] * m_[3]) + (rhs.m_[5] * m_[7]) + (rhs.m_[6] * m_[11]) + (rhs.m_[7] * m_[15]));
+        T r2c0((rhs.m_[8] * m_[0]) + (rhs.m_[9] * m_[4]) + (rhs.m_[10] * m_[8]) + (rhs.m_[11] * m_[12]));
+        T r2c1((rhs.m_[8] * m_[1]) + (rhs.m_[9] * m_[5]) + (rhs.m_[10] * m_[9]) + (rhs.m_[11] * m_[13]));
+        T r2c2((rhs.m_[8] * m_[2]) + (rhs.m_[9] * m_[6]) + (rhs.m_[10] * m_[10]) + (rhs.m_[11] * m_[14]));
+        T r2c3((rhs.m_[8] * m_[3]) + (rhs.m_[9] * m_[7]) + (rhs.m_[10] * m_[11]) + (rhs.m_[11] * m_[15]));
+        T r3c0((rhs.m_[12] * m_[0]) + (rhs.m_[13] * m_[4]) + (rhs.m_[14] * m_[8]) + (rhs.m_[15] * m_[12]));
+        T r3c1((rhs.m_[12] * m_[1]) + (rhs.m_[13] * m_[5]) + (rhs.m_[14] * m_[9]) + (rhs.m_[15] * m_[13]));
+        T r3c2((rhs.m_[12] * m_[2]) + (rhs.m_[13] * m_[6]) + (rhs.m_[14] * m_[10]) + (rhs.m_[15] * m_[14]));
+        T r3c3((rhs.m_[12] * m_[3]) + (rhs.m_[13] * m_[7]) + (rhs.m_[14] * m_[11]) + (rhs.m_[15] * m_[15]));
+
         m_[0] = r0c0;
         m_[1] = r0c1;
         m_[2] = r0c2;

=== modified file 'src/program.cc'
--- src/program.cc	2011-03-11 21:44:11 +0000
+++ src/program.cc	2011-04-13 01:40:50 +0000
@@ -262,7 +262,7 @@
     }
 
     // Our matrix representation is row-major, so transpose is true here.
-    glUniformMatrix4fv(location, 1, GL_TRUE, m);
+    glUniformMatrix4fv(location, 1, GL_FALSE, m);
     ready_ = true;
 }