diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-22 21:48:47 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-22 21:48:47 +0300 |
| commit | 98a0dd6888b74de132fa936e15f5d589042e8f91 (patch) | |
| tree | b3e0f498fd73dc7fda77d8393cc599b15e0265ac /source/blender/draw/intern | |
| parent | 0c2fd1357d32744c59957e0bdc846d34e7b74f30 (diff) | |
OpenGL: load projection matrix with new API
New API does not share legacy OpenGL's concept of matrix modes.
Part of T49450
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 12 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_view.c | 4 |
2 files changed, 3 insertions, 13 deletions
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 { |