diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_subwindow.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_subwindow.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 458ac4a121a..d73aa107cab 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -47,8 +47,7 @@ #include "BIF_gl.h" -#include "GPU_extensions.h" -#include "GPU_basic_shader.h" +#include "GPU_matrix.h" #include "WM_api.h" #include "wm_subwindow.h" @@ -150,7 +149,7 @@ static void wm_swin_matrix_get(wmWindow *win, wmSubWindow *swin, float mat[4][4] orthographic_m4(mat, -GLA_PIXEL_OFS, (float)width - GLA_PIXEL_OFS, -GLA_PIXEL_OFS, (float)height - GLA_PIXEL_OFS, -100, 100); } else { - glGetFloatv(GL_PROJECTION_MATRIX, (float *)mat); + gpuGetProjectionMatrix3D(mat); } } void wm_subwindow_matrix_get(wmWindow *win, int swinid, float mat[4][4]) @@ -216,7 +215,7 @@ int wm_subwindow_open(wmWindow *win, const rcti *winrct, bool activate) /* extra service */ wm_swin_size_get(swin, &width, &height); wmOrtho2_pixelspace(width, height); - glLoadIdentity(); + gpuLoadIdentity(); } return swin->swinid; @@ -322,7 +321,7 @@ void wmSubWindowScissorSet(wmWindow *win, int swinid, const rcti *srct, bool src glScissor(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height); wmOrtho2_pixelspace(width, height); - glLoadIdentity(); + gpuLoadIdentity(); glFlush(); } @@ -333,31 +332,13 @@ void wmSubWindowSet(wmWindow *win, int swinid) wmSubWindowScissorSet(win, swinid, NULL, true); } -void wmFrustum(float x1, float x2, float y1, float y2, float n, float f) -{ - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glFrustum(x1, x2, y1, y2, n, f); - glMatrixMode(GL_MODELVIEW); -} - -void wmOrtho(float x1, float x2, float y1, float y2, float n, float f) -{ - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - glOrtho(x1, x2, y1, y2, n, f); - - glMatrixMode(GL_MODELVIEW); -} - void wmOrtho2(float x1, float x2, float y1, float y2) { /* prevent opengl from generating errors */ if (x1 == x2) x2 += 1.0f; if (y1 == y2) y2 += 1.0f; - wmOrtho(x1, x2, y1, y2, -100, 100); + gpuOrtho(x1, x2, y1, y2, -100, 100); } static void wmOrtho2_offset(const float x, const float y, const float ofs) |