Fix #20891: opengl animation render could mess up the view.

The problem was that wmPushMatrix/wmOrtho/.. and similar functions did not
work well for offscreen rendering. It would have been possible to make a
fake subwindow for this, but I decided to just remove this extra layer as
it does not seem to have much purpose and has been quite confusing when
trying to fix other bugs. The relevant matrices are already stored in
RegionView3D so there will be no increase in calls to glGetFloat, which may
have been a performance reason to use this system in the past.

3 files changed, 23 insertions, 151 deletions

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index e7521db462d..f59ad924cf8 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -278,23 +278,14 @@ struct wmDropBox	*WM_dropbox_add(ListBase *lb, const char *idname, int (*poll)(s
 						  void (*copy)(struct wmDrag *, struct wmDropBox *));
 ListBase	*WM_dropboxmap_find(char *idname, int spaceid, int regionid);
 
-			/* OpenGL wrappers, mimicking opengl syntax */
+			/* Set a subwindow active in pixelspace view, with optional scissor subset */
 void		wmSubWindowSet			(struct wmWindow *win, int swinid);
 void		wmSubWindowScissorSet	(struct wmWindow *win, int swinid, struct rcti *srct);
 
-void		wmLoadMatrix		(float mat[][4]);
-void		wmGetMatrix			(float mat[][4]);
-void		wmMultMatrix		(float mat[][4]);
-void		wmGetSingleMatrix	(float mat[][4]);
-void		wmScale				(float x, float y, float z);
-void		wmLoadIdentity		(void);		/* note: old name clear_view_mat */
-void		wmPushMatrix		(void);		/* one level only */
-void		wmPopMatrix			(void);		/* one level only */
-
+			/* OpenGL utilities with safety check + working in modelview matrix mode */
 void		wmFrustum			(float x1, float x2, float y1, float y2, float n, float f);
 void		wmOrtho				(float x1, float x2, float y1, float y2, float n, float f);
 void		wmOrtho2			(float x1, float x2, float y1, float y2);
-void		wmOrthoPixelSpace	(void);
 
 			/* utilities */
 void		WM_set_framebuffer_index_color(int index);
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index 47d8c8d9831..e9f32f6526e 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -318,7 +318,6 @@ void wm_gesture_draw(wmWindow *win)
 	for(; gt; gt= gt->next) {
 		/* all in subwindow space */
 		wmSubWindowSet(win, gt->swinid);
-		wmOrthoPixelSpace();
 		
 		if(gt->type==WM_GESTURE_RECT)
 			wm_gesture_draw_rect(win, gt);
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c
index 68f53a8367f..349cc26b618 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -66,9 +66,6 @@ typedef struct wmSubWindow {
 	
 	rcti winrct;
 	int swinid;
-	
-	float viewmat[4][4], winmat[4][4];
-	float viewmat1[4][4], winmat1[4][4];
 } wmSubWindow;
 
 
@@ -132,8 +129,15 @@ void wm_subwindow_getmatrix(wmWindow *win, int swinid, float mat[][4])
 {
 	wmSubWindow *swin= swin_from_swinid(win, swinid);
 
-	if(swin)
-		mul_m4_m4m4(mat, swin->viewmat, swin->winmat);
+	if(swin) {
+		/* used by UI, should find a better way to get the matrix there */
+		float viewmat[4][4], winmat[4][4];
+
+		glGetFloatv(GL_MODELVIEW_MATRIX, (float*)winmat);
+		glGetFloatv(GL_PROJECTION_MATRIX, (float*)viewmat);
+
+		mul_m4_m4m4(mat, viewmat, winmat);
+	}
 }
 
 /* always sets pixel-precise 2D window/view matrices */
@@ -155,16 +159,13 @@ int wm_subwindow_open(wmWindow *win, rcti *winrct)
 	swin->swinid= freewinid;
 	swin->winrct= *winrct;
 
-	unit_m4(swin->viewmat);
-	unit_m4(swin->winmat);
-	
 	/* and we appy it all right away */
 	wmSubWindowSet(win, swin->swinid);
 	
 	/* extra service */
 	wm_subwindow_getsize(win, swin->swinid, &width, &height);
 	wmOrtho2(-0.375, (float)width-0.375, -0.375, (float)height-0.375);
-	wmLoadIdentity();
+	glLoadIdentity();
 
 	return swin->swinid;
 }
@@ -257,11 +258,9 @@ void wmSubWindowScissorSet(wmWindow *win, int swinid, rcti *srct)
 	else
 		glScissor(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height);
 	
-	glMatrixMode(GL_PROJECTION);
-	glLoadMatrixf(&_curswin->winmat[0][0]);
-	glMatrixMode(GL_MODELVIEW);
-	glLoadMatrixf(&_curswin->viewmat[0][0]);
-	
+	wmOrtho2(-0.375, (float)width-0.375, -0.375, (float)height-0.375);
+	glLoadIdentity();
+
 	glFlush();
 }
 
@@ -272,129 +271,22 @@ void wmSubWindowSet(wmWindow *win, int swinid)
 	wmSubWindowScissorSet(win, swinid, NULL);
 }
 
-void wmLoadMatrix(float mat[][4])
-{
-	if(_curswin==NULL) return;
-	
-	glLoadMatrixf(mat);
-	
-	if (glaGetOneInteger(GL_MATRIX_MODE)==GL_MODELVIEW)
-		copy_m4_m4(_curswin->viewmat, mat);
-	else
-		copy_m4_m4(_curswin->winmat, mat);
-}
-
-void wmGetMatrix(float mat[][4])
-{
-	if(_curswin==NULL) return;
-	
-	if (glaGetOneInteger(GL_MATRIX_MODE)==GL_MODELVIEW) {
-		copy_m4_m4(mat, _curswin->viewmat);
-	} else {
-		copy_m4_m4(mat, _curswin->winmat);
-	}
-}
-
-void wmMultMatrix(float mat[][4])
-{
-	if(_curswin==NULL) return;
-	
-	glMultMatrixf((float*) mat);
-	
-	if (glaGetOneInteger(GL_MATRIX_MODE)==GL_MODELVIEW)
-		glGetFloatv(GL_MODELVIEW_MATRIX, (float *)_curswin->viewmat);
-	else
-		glGetFloatv(GL_MODELVIEW_MATRIX, (float *)_curswin->winmat);
-}
-
-static int debugpush= 0;
-
-void wmPushMatrix(void)
-{
-	if(_curswin==NULL) return;
-	
-	if(debugpush)
-		printf("wmPushMatrix error already pushed\n");
-	debugpush= 1;
-	
-	copy_m4_m4(_curswin->viewmat1, _curswin->viewmat);
-	copy_m4_m4(_curswin->winmat1, _curswin->winmat);
-}
-
-void wmPopMatrix(void)
+void wmFrustum(float x1, float x2, float y1, float y2, float n, float f)
 {
-	if(_curswin==NULL) return;
-	
-	if(debugpush==0)
-		printf("wmPopMatrix error nothing popped\n");
-	debugpush= 0;
-	
-	copy_m4_m4(_curswin->viewmat, _curswin->viewmat1);
-	copy_m4_m4(_curswin->winmat, _curswin->winmat1);
-	
 	glMatrixMode(GL_PROJECTION);
-	glLoadMatrixf(&_curswin->winmat[0][0]);
+	glLoadIdentity();
+	glFrustum(x1, x2, y1, y2, n, f);
 	glMatrixMode(GL_MODELVIEW);
-	glLoadMatrixf(&_curswin->viewmat[0][0]);
-	
-}
-
-void wmGetSingleMatrix(float mat[][4])
-{
-	if(_curswin)
-		mul_m4_m4m4(mat, _curswin->viewmat, _curswin->winmat);
-}
-
-void wmScale(float x, float y, float z)
-{
-	if(_curswin==NULL) return;
-	
-	glScalef(x, y, z);
-	
-	if (glaGetOneInteger(GL_MATRIX_MODE)==GL_MODELVIEW)
-		glGetFloatv(GL_MODELVIEW_MATRIX, (float *)_curswin->viewmat);
-	else
-		glGetFloatv(GL_MODELVIEW_MATRIX, (float *)_curswin->winmat);
-	
 }
 
-void wmLoadIdentity(void)
+void wmOrtho(float x1, float x2, float y1, float y2, float n, float f)
 {
-	if(_curswin==NULL) return;
-	
-	if (glaGetOneInteger(GL_MATRIX_MODE)==GL_MODELVIEW)
-		unit_m4(_curswin->viewmat);
-	else
-		unit_m4(_curswin->winmat);
-	
+	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-}
 
-void wmFrustum(float x1, float x2, float y1, float y2, float n, float f)
-{
-	if(_curswin) {
+	glOrtho(x1, x2, y1, y2, n, f);
 
-		glMatrixMode(GL_PROJECTION);
-		glLoadIdentity();
-		glFrustum(x1, x2, y1, y2, n, f);
-
-		glGetFloatv(GL_PROJECTION_MATRIX, (float *)_curswin->winmat);
-		glMatrixMode(GL_MODELVIEW);
-	}
-}
-
-void wmOrtho(float x1, float x2, float y1, float y2, float n, float f)
-{
-	if(_curswin) {
-		
-		glMatrixMode(GL_PROJECTION);
-		glLoadIdentity();
-		
-		glOrtho(x1, x2, y1, y2, n, f);
-		
-		glGetFloatv(GL_PROJECTION_MATRIX, (float *)_curswin->winmat);
-		glMatrixMode(GL_MODELVIEW);
-	}
+	glMatrixMode(GL_MODELVIEW);
 }
 
 void wmOrtho2(float x1, float x2, float y1, float y2)
@@ -402,18 +294,8 @@ void wmOrtho2(float x1, float x2, float y1, float y2)
 	/* prevent opengl from generating errors */
 	if(x1==x2) x2+=1.0;
 	if(y1==y2) y2+=1.0;
-	wmOrtho(x1, x2, y1, y2, -100, 100);
-}
 
-void wmOrthoPixelSpace(void)
-{
-	if(_curswin) {
-		int width, height;
-
-		wm_subwindow_getsize(_curwindow, _curswin->swinid, &width, &height);
-		wmOrtho2(-0.375, (float)width-0.375, -0.375, (float)height-0.375);
-		wmLoadIdentity();
-	}
+	wmOrtho(x1, x2, y1, y2, -100, 100);
 }
 
 /* *************************** Framebuffer color depth, for selection codes ********************** */