From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 11 Dec 2002 03:06:44 +0000 (+0000)
Subject: I guess those glLoadIdentity calls were more important than expected
X-Git-Tag: RELEASE_0_2_0_RC1~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7742409c24548c8708e5e6f37544d4f38008c428;p=xonotic%2Fdarkplaces.git

I guess those glLoadIdentity calls were more important than expected


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2680 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_backend.c b/gl_backend.c
index d61fcef7..a206d951 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -249,6 +249,7 @@ void GL_SetupView_Mode_Perspective (double fovx, double fovy, double zNear, doub
 
 	// set up viewpoint
 	qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+	qglLoadIdentity();CHECKGLERROR
 	// pyramid slopes
 	xmax = zNear * tan(fovx * M_PI / 360.0);
 	ymax = zNear * tan(fovy * M_PI / 360.0);
@@ -267,6 +268,7 @@ void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double fovx, double fovy, dou
 
 	// set up viewpoint
 	qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+	qglLoadIdentity();CHECKGLERROR
 	// set view pyramid
 	nudge = 1.0 - 1.0 / (1<<23);
 	m[ 0] = 1.0 / tan(fovx * M_PI / 360.0);
@@ -313,6 +315,7 @@ void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double
 
 	// set up viewpoint
 	qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+	qglLoadIdentity();CHECKGLERROR
 	qglOrtho(x1, x2, y2, y1, zNear, zFar);
 	qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
 	GL_SetupView_Orientation_Identity();
diff --git a/glquake.h b/glquake.h
index ee2c8d1e..ee2fb7a9 100644
--- a/glquake.h
+++ b/glquake.h
@@ -404,7 +404,7 @@ extern void (GLAPIENTRY *qglFrustum)(GLdouble left, GLdouble right, GLdouble bot
 extern void (GLAPIENTRY *qglViewport)(GLint x, GLint y, GLsizei width, GLsizei height);
 //extern void (GLAPIENTRY *qglPushMatrix)(void);
 //extern void (GLAPIENTRY *qglPopMatrix)(void);
-//extern void (GLAPIENTRY *qglLoadIdentity)(void);
+extern void (GLAPIENTRY *qglLoadIdentity)(void);
 //extern void (GLAPIENTRY *qglLoadMatrixd)(const GLdouble *m);
 extern void (GLAPIENTRY *qglLoadMatrixf)(const GLfloat *m);
 //extern void (GLAPIENTRY *qglMultMatrixd)(const GLdouble *m);
diff --git a/vid_shared.c b/vid_shared.c
index f711424d..24bb5d62 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -127,7 +127,7 @@ void (GLAPIENTRY *qglFrustum)(GLdouble left, GLdouble right, GLdouble bottom, GL
 void (GLAPIENTRY *qglViewport)(GLint x, GLint y, GLsizei width, GLsizei height);
 //void (GLAPIENTRY *qglPushMatrix)(void);
 //void (GLAPIENTRY *qglPopMatrix)(void);
-//void (GLAPIENTRY *qglLoadIdentity)(void);
+void (GLAPIENTRY *qglLoadIdentity)(void);
 //void (GLAPIENTRY *qglLoadMatrixd)(const GLdouble *m);
 void (GLAPIENTRY *qglLoadMatrixf)(const GLfloat *m);
 //void (GLAPIENTRY *qglMultMatrixd)(const GLdouble *m);
@@ -269,7 +269,7 @@ static dllfunction_t opengl110funcs[] =
 	{"glViewport", (void **) &qglViewport},
 //	{"glPushMatrix", (void **) &qglPushMatrix},
 //	{"glPopMatrix", (void **) &qglPopMatrix},
-//	{"glLoadIdentity", (void **) &qglLoadIdentity},
+	{"glLoadIdentity", (void **) &qglLoadIdentity},
 //	{"glLoadMatrixd", (void **) &qglLoadMatrixd},
 	{"glLoadMatrixf", (void **) &qglLoadMatrixf},
 //	{"glMultMatrixd", (void **) &qglMultMatrixd},