Merge remote branch 'origin/master' into nv50-compiler

Conflicts:
	src/gallium/drivers/nv50/nv50_program.c

1 files changed, 19 insertions, 0 deletions

diff --git a/src/glsl/tests/matrix-08.glsl b/src/glsl/tests/matrix-08.glsl
new file mode 100644
index 0000000000..38138d22de
--- /dev/null
+++ b/src/glsl/tests/matrix-08.glsl
@@ -0,0 +1,19 @@
+#version 120
+/* PASS */
+
+uniform mat2x3 a;
+uniform mat3x2 b;
+uniform mat3x3 c;
+uniform mat3x3 d;
+
+void main()
+{
+    mat3x3 x;
+
+    /* Multiplying a 2 column, 3 row matrix with a 3 column, 2 row matrix
+     * results in a 3 column, 3 row matrix.
+     */
+    x = (a * b) + c / d;
+
+    gl_Position = gl_Vertex;
+}