[Bf-blender-cvs] [7979bc4c518] blender2.8: OpenGL: remove gpuMatrixBegin3D_legacy function

Mike Erwin noreply at git.blender.org
Mon Mar 27 08:10:22 CEST 2017


Commit: 7979bc4c5182341fd063907c4a60d92134aad7d5
Author: Mike Erwin
Date:   Mon Mar 27 02:06:33 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB7979bc4c5182341fd063907c4a60d92134aad7d5

OpenGL: remove gpuMatrixBegin3D_legacy function

It helped during the transition, but we don't need this anymore. Evolution of T49450

===================================================================

M	source/blender/gpu/GPU_matrix.h
M	source/blender/gpu/intern/gpu_matrix.c

===================================================================

diff --git a/source/blender/gpu/GPU_matrix.h b/source/blender/gpu/GPU_matrix.h
index d0194659db5..85b1b5c7acf 100644
--- a/source/blender/gpu/GPU_matrix.h
+++ b/source/blender/gpu/GPU_matrix.h
@@ -131,12 +131,6 @@ const float *gpuGetNormalMatrix(float m[3][3]);
 const float *gpuGetNormalMatrixInverse(float m[3][3]);
 
 
-#if SUPPORT_LEGACY_MATRIX
-/* copy top matrix from each legacy stack into new fresh stack */
-void gpuMatrixBegin3D_legacy(void);
-#endif
-
-
 /* set uniform values for currently bound shader */
 void gpuBindMatrices(GLuint program);
 bool gpuMatricesDirty(void); /* since last bind */
diff --git a/source/blender/gpu/intern/gpu_matrix.c b/source/blender/gpu/intern/gpu_matrix.c
index 064f31ed834..8f8754f612d 100644
--- a/source/blender/gpu/intern/gpu_matrix.c
+++ b/source/blender/gpu/intern/gpu_matrix.c
@@ -92,18 +92,6 @@ void gpuMatrixBegin3D(void)
 	unit_m4(Projection3D);
 }
 
-#if SUPPORT_LEGACY_MATRIX
-void gpuMatrixBegin3D_legacy(void)
-{
-	/* copy top matrix from each legacy stack into new fresh stack */
-	state.mode = MATRIX_MODE_3D;
-	state.top = 0;
-	state.dirty = true;
-	glGetFloatv(GL_MODELVIEW_MATRIX, (float*)ModelView3D);
-	glGetFloatv(GL_PROJECTION_MATRIX, (float*)Projection3D);
-}
-#endif
-
 void gpuMatrixEnd(void)
 {
 	state.mode = MATRIX_MODE_INACTIVE;




More information about the Bf-blender-cvs mailing list