Implement glLoadMatrixx() and glMultMatrixx().

Bug 21499847 Change-Id: I245a624cad7c47af9d93844d4ae272c873b42008 Reviewed-on: https://swiftshader-review.googlesource.com/3820Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Implement glLoadMatrixx() and glMultMatrixx().
769783ca · Nicolas Capens · 44ffb65e · 769783ca
Commit 769783ca authored Aug 07, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 2 deletions

libGLES_CM.cpp src/OpenGL/libGLES_CM/libGLES_CM.cpp +18 -2

No files found.
--- a/src/OpenGL/libGLES_CM/libGLES_CM.cpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
@@ -2860,7 +2860,15 @@ void LoadMatrixf(const GLfloat *m)

 void LoadMatrixx(const GLfixed *m)
 {
-	UNIMPLEMENTED();
+	GLfloat matrix[16] =
+	{
+		(float)m[0] / 0x10000,  (float)m[1] / 0x10000,  (float)m[2] / 0x10000,  (float)m[3] / 0x10000,
+		(float)m[4] / 0x10000,  (float)m[5] / 0x10000,  (float)m[6] / 0x10000,  (float)m[7] / 0x10000,
+		(float)m[8] / 0x10000,  (float)m[9] / 0x10000,  (float)m[10] / 0x10000, (float)m[11] / 0x10000,
+		(float)m[12] / 0x10000, (float)m[13] / 0x10000, (float)m[14] / 0x10000, (float)m[15] / 0x10000
+	};
+
+	LoadMatrixf(matrix);
 }

 void LogicOp(GLenum opcode)
@@ -3008,7 +3016,15 @@ void MultMatrixf(const GLfloat *m)

 void MultMatrixx(const GLfixed *m)
 {
-	UNIMPLEMENTED();
+	GLfloat matrix[16] =
+	{
+		(float)m[0] / 0x10000,  (float)m[1] / 0x10000,  (float)m[2] / 0x10000,  (float)m[3] / 0x10000,
+		(float)m[4] / 0x10000,  (float)m[5] / 0x10000,  (float)m[6] / 0x10000,  (float)m[7] / 0x10000,
+		(float)m[8] / 0x10000,  (float)m[9] / 0x10000,  (float)m[10] / 0x10000, (float)m[11] / 0x10000,
+		(float)m[12] / 0x10000, (float)m[13] / 0x10000, (float)m[14] / 0x10000, (float)m[15] / 0x10000
+	};
+
+	MultMatrixf(matrix);
 }

 void MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)