[Bf-blender-cvs] [8b204831f2e] blender2.8: OpenGL: use new matrix implementation in "Modern" viewport

Mike Erwin noreply at git.blender.org
Mon Mar 27 07:18:22 CEST 2017


Commit: 8b204831f2e3d1c8f4eed720ce618e2240d627b4
Author: Mike Erwin
Date:   Sun Mar 26 21:23:11 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB8b204831f2e3d1c8f4eed720ce618e2240d627b4

OpenGL: use new matrix implementation in "Modern" viewport

This change looks small, but it switches the entire 3D viewport from legacy OpenGL functions to our own code.

Kept non-modern viewport on legacy path so we can compare easily (via the Modern Viewport checkbox).

Part of T49450

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

M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 808933b5d80..eef040053e9 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2286,10 +2286,7 @@ static void view3d_draw_view(const bContext *C, ARegion *ar, DrawData *draw_data
 	glClear(GL_DEPTH_BUFFER_BIT);
 //	glDisable(GL_DEPTH_TEST); /* should be set by default */
 
-	glMatrixMode(GL_PROJECTION); //
-	gpuLoadIdentity();           // TODO: replace these lines with gpuMatrixBegin3D
-	glMatrixMode(GL_MODELVIEW);  //
-	gpuLoadIdentity();           //
+	gpuMatrixBegin3D();
 
 	view3d_draw_background(C); /* clears/overwrites entire color buffer */
 
@@ -2313,6 +2310,8 @@ static void view3d_draw_view(const bContext *C, ARegion *ar, DrawData *draw_data
 	view3d_draw_reference_images(C);
 	view3d_draw_manipulator(C);
 
+	gpuMatrixEnd();
+
 	glDisable(GL_DEPTH_TEST);
 
 	view3d_draw_region_info(C, ar);




More information about the Bf-blender-cvs mailing list