From 98a0dd6888b74de132fa936e15f5d589042e8f91 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Wed, 22 Mar 2017 14:48:47 -0400 Subject: OpenGL: load projection matrix with new API New API does not share legacy OpenGL's concept of matrix modes. Part of T49450 --- source/blender/draw/intern/draw_manager.c | 12 ++---------- source/blender/draw/intern/draw_view.c | 4 +--- 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'source/blender/draw/intern') diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index ad4678d8ee1..c9ba26824e0 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1065,11 +1065,7 @@ void DRW_draw_callbacks_pre_scene(void) struct ARegion *ar = CTX_wm_region(DST.context); RegionView3D *rv3d = CTX_wm_region_view3d(DST.context); - /* This is temporary - * waiting for the full matrix switch */ - glMatrixMode(GL_PROJECTION); - gpuLoadMatrix3D(rv3d->winmat); - glMatrixMode(GL_MODELVIEW); + gpuLoadProjectionMatrix3D(rv3d->winmat); gpuLoadMatrix3D(rv3d->viewmat); ED_region_draw_cb_draw(DST.context, ar, REGION_DRAW_PRE_VIEW); @@ -1080,11 +1076,7 @@ void DRW_draw_callbacks_post_scene(void) struct ARegion *ar = CTX_wm_region(DST.context); RegionView3D *rv3d = CTX_wm_region_view3d(DST.context); - /* This is temporary - * waiting for the full matrix switch */ - glMatrixMode(GL_PROJECTION); - gpuLoadMatrix3D(rv3d->winmat); - glMatrixMode(GL_MODELVIEW); + gpuLoadProjectionMatrix3D(rv3d->winmat); gpuLoadMatrix3D(rv3d->viewmat); ED_region_draw_cb_draw(DST.context, ar, REGION_DRAW_POST_VIEW); diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index e0a19cec7ad..2620989bcbe 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -531,9 +531,7 @@ void DRW_draw_grid(void) *(&grid_unit) = NULL; /* drawgrid need this to detect/affect smallest valid unit... */ drawgrid(&scene->unit, ar, v3d, &grid_unit); - glMatrixMode(GL_PROJECTION); - gpuLoadMatrix3D(rv3d->winmat); - glMatrixMode(GL_MODELVIEW); + gpuLoadProjectionMatrix3D(rv3d->winmat); gpuLoadMatrix3D(rv3d->viewmat); } else { -- cgit v1.2.3