[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49205] branches/soc-2012-swiss_cheese/ source/blender: added a gpuGetMatrixMode

[Jason Wilkins]

Revision: 49205
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49205
Author:   jwilkins
Date:     2012-07-25 13:09:20 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
added a gpuGetMatrixMode

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_matrix.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_matrix.c

Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-07-25 13:09:12 UTC (rev 49204)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-07-25 13:09:20 UTC (rev 49205)
@@ -548,14 +548,11 @@
 
 #if GPU_SAFETY
 	{
-	GLenum mode;
 	GLenum param;
-
-	glGetIntegerv(GL_MATRIX_MODE, &mode);
-	GPU_ASSERT(mode == GL_MODELVIEW);
-
 	glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &param);
 	GPU_ASSERT(param == GL_MODULATE);
+
+	GPU_ASSERT(gpuGetMatrixMode() == GL_MODELVIEW);
 	}
 #endif
 

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_matrix.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_matrix.h	2012-07-25 13:09:12 UTC (rev 49204)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_matrix.h	2012-07-25 13:09:20 UTC (rev 49205)
@@ -21,6 +21,7 @@
 void gpuPopMatrix(void);
 
 void gpuMatrixMode(GLenum mode);
+GLenum gpuGetMatrixMode(void);
 
 void gpuLoadMatrix(const GLfloat * m);
 GLfloat * gpuGetMatrix(GLfloat * m);

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_matrix.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_matrix.c	2012-07-25 13:09:12 UTC (rev 49204)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_matrix.c	2012-07-25 13:09:20 UTC (rev 49205)
@@ -23,7 +23,7 @@
 #define GPU_STACK_DEBUG
 #endif
 
-GLint glslneedupdate = 1;
+static GLint glslneedupdate = 1;
 
 typedef GLfloat GPU_matrix[4][4];
 
@@ -37,11 +37,12 @@
 
 } GPU_matrix_stack;
 
-GPU_matrix_stack ms_modelview;
-GPU_matrix_stack ms_projection;
-GPU_matrix_stack ms_texture;
+static GPU_matrix_stack ms_modelview;
+static GPU_matrix_stack ms_projection;
+static GPU_matrix_stack ms_texture;
 
-GPU_matrix_stack * ms_current;
+static GPU_matrix_stack * ms_current;
+static GLenum ms_current_mode;
 
 void GPU_matrix_forced_update(void)
 {
@@ -105,6 +106,7 @@
 	ms_init(&ms_texture, 16);
 
 	ms_current = &ms_modelview;
+	ms_current_mode = GL_MODELVIEW;
 
 	printf("Stack init\n");
 
@@ -304,6 +306,8 @@
 {
 	GPU_ASSERT(ELEM3(mode, GL_MODELVIEW, GL_PROJECTION, GL_TEXTURE));
 
+	ms_current_mode = mode;
+
 	switch(mode)
 	{
 		case GL_MODELVIEW:
@@ -323,6 +327,10 @@
 CHECKMAT
 }
 
+GLenum gpuGetMatrixMode(void)
+{
+	return ms_current_mode;
+}
 
 void gpuLoadMatrix(const GLfloat * m)
 {