Implement glFrustum() for OpenGL ES 1.1.

src/OpenGL/libGL/libGL.cpp

@@ -6239,7 +6239,7 @@ void APIENTRY glFogiv(GLenum pname, const GLint *params)
 
 void APIENTRY glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-	TRACE("(*)");
+	TRACE("(GLdouble left = %f, GLdouble right = %f, GLdouble bottom = %f, GLdouble top = %f, GLdouble zNear = %f, GLdouble zFar = %f)", left, right, bottom, top, zNear, zFar);
 
 	gl::Context *context = gl::getContext();
 

src/OpenGL/libGLES_CM/Context.cpp

@@ -2646,6 +2646,11 @@ void Context::multiply(const GLfloat *m)
     currentMatrixStack().multiply(m);
 }
 
+void Context::frustum(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)
+{
+	currentMatrixStack().frustum(left, right, bottom, top, zNear, zFar);
+}
+
 void Context::ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)
 {
 	currentMatrixStack().ortho(left, right, bottom, top, zNear, zFar);

src/OpenGL/libGLES_CM/Context.h

@@ -445,6 +445,7 @@ public:
     void translate(GLfloat x, GLfloat y, GLfloat z);
 	void scale(GLfloat x, GLfloat y, GLfloat z);
     void multiply(const GLfloat *m);
+	void frustum(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
     void ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
 
 private:

src/OpenGL/libGLES_CM/MatrixStack.cpp

@@ -113,8 +113,8 @@ namespace sw
 
 		float A = (r + l) / (r - l);
 		float B = (t + b) / (t - b);
-		float C = -(f + n) / (r - n);
-		float D = -2 * r * n / (f - n);
+		float C = -(f + n) / (f - n);
+		float D = -2 * f * n / (f - n);
 
 		Matrix frustum(2 * n / (r - l), 0,               A,  0,
 		               0,               2 * n / (t - b), B,  0,

src/OpenGL/libGLES_CM/libGLES_CM.cpp

@@ -1868,7 +1868,14 @@ void GL_APIENTRY glFrontFace(GLenum mode)
 
 void GL_APIENTRY glFrustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)
 {
-	UNIMPLEMENTED();
+	TRACE("(GLfloat left = %f, GLfloat right = %f, GLfloat bottom = %f, GLfloat top = %f, GLfloat zNear = %f, GLfloat zFar = %f)", left, right, bottom, top, zNear, zFar);
+
+	es1::Context *context = es1::getContext();
+
+	if(context)
+	{
+		context->frustum(left, right, bottom, top, zNear, zFar);
+	}
 }
 
 void GL_APIENTRY glFrustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar)
@@ -2874,7 +2881,7 @@ void GL_APIENTRY glNormalPointer(GLenum type, GLsizei stride, const GLvoid *poin
 {
 	TRACE("(GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = 0x%0.8p)", type, stride, pointer);
 
-glVertexAttribPointer(sw::Normal, 3, type, false, stride, pointer);
+	glVertexAttribPointer(sw::Normal, 3, type, false, stride, pointer);
 }
 
 void GL_APIENTRY glOrthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)

src/OpenGL/libGLESv2/Context.cpp

@@ -1553,19 +1553,19 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
 		UNIMPLEMENTED();
 		*params = GL_BACK;
 		break;
-	case GL_DRAW_BUFFER1: // symbolic constant, initial value is GL_NONE
-	case GL_DRAW_BUFFER2:
-	case GL_DRAW_BUFFER3:
-	case GL_DRAW_BUFFER4:
-	case GL_DRAW_BUFFER5:
-	case GL_DRAW_BUFFER6:
-	case GL_DRAW_BUFFER7:
-	case GL_DRAW_BUFFER8:
-	case GL_DRAW_BUFFER9:
-	case GL_DRAW_BUFFER10:
-	case GL_DRAW_BUFFER11:
-	case GL_DRAW_BUFFER12:
-	case GL_DRAW_BUFFER13:
+	case GL_DRAW_BUFFER1: // symbolic constant, initial value is GL_NONE
+	case GL_DRAW_BUFFER2:
+	case GL_DRAW_BUFFER3:
+	case GL_DRAW_BUFFER4:
+	case GL_DRAW_BUFFER5:
+	case GL_DRAW_BUFFER6:
+	case GL_DRAW_BUFFER7:
+	case GL_DRAW_BUFFER8:
+	case GL_DRAW_BUFFER9:
+	case GL_DRAW_BUFFER10:
+	case GL_DRAW_BUFFER11:
+	case GL_DRAW_BUFFER12:
+	case GL_DRAW_BUFFER13:
 	case GL_DRAW_BUFFER14:
 	case GL_DRAW_BUFFER15:
 		UNIMPLEMENTED();
@@ -1887,19 +1887,19 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
       case GL_TEXTURE_BINDING_3D_OES:
       case GL_COPY_READ_BUFFER_BINDING:
       case GL_COPY_WRITE_BUFFER_BINDING:
-      case GL_DRAW_BUFFER0:
-      case GL_DRAW_BUFFER1:
-      case GL_DRAW_BUFFER2:
-      case GL_DRAW_BUFFER3:
-      case GL_DRAW_BUFFER4:
-      case GL_DRAW_BUFFER5:
-      case GL_DRAW_BUFFER6:
-      case GL_DRAW_BUFFER7:
-      case GL_DRAW_BUFFER8:
-      case GL_DRAW_BUFFER9:
-      case GL_DRAW_BUFFER10:
-      case GL_DRAW_BUFFER11:
-      case GL_DRAW_BUFFER12:
+      case GL_DRAW_BUFFER0:
+      case GL_DRAW_BUFFER1:
+      case GL_DRAW_BUFFER2:
+      case GL_DRAW_BUFFER3:
+      case GL_DRAW_BUFFER4:
+      case GL_DRAW_BUFFER5:
+      case GL_DRAW_BUFFER6:
+      case GL_DRAW_BUFFER7:
+      case GL_DRAW_BUFFER8:
+      case GL_DRAW_BUFFER9:
+      case GL_DRAW_BUFFER10:
+      case GL_DRAW_BUFFER11:
+      case GL_DRAW_BUFFER12:
       case GL_DRAW_BUFFER13:
       case GL_DRAW_BUFFER14:
       case GL_DRAW_BUFFER15: