diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-17 20:13:43 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-18 04:43:52 +0300 |
commit | d19b3019d9aee026b7aab738624795da162f6a8b (patch) | |
tree | 88978d4de72db83bc5900e63325530c6c0b153b4 /source/blender | |
parent | a6bd7777c20aa229ae9c4cdd537e94cf8a9c7edf (diff) |
Cleanup: GPU: Encapsulate glScissor
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 10 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_subwindow.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 75580824d9c..fa335501d60 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -107,10 +107,10 @@ static void wm_paintcursor_draw(bContext *C, ScrArea *area, ARegion *region) if (pc->poll == NULL || pc->poll(C)) { /* Prevent drawing outside region. */ glEnable(GL_SCISSOR_TEST); - glScissor(region->winrct.xmin, - region->winrct.ymin, - BLI_rcti_size_x(®ion->winrct) + 1, - BLI_rcti_size_y(®ion->winrct) + 1); + GPU_scissor(region->winrct.xmin, + region->winrct.ymin, + BLI_rcti_size_x(®ion->winrct) + 1, + BLI_rcti_size_y(®ion->winrct) + 1); if (ELEM(win->grabcursor, GHOST_kGrabWrap, GHOST_kGrabHide)) { int x = 0, y = 0; @@ -462,7 +462,7 @@ static void wm_draw_region_bind(ARegion *region, int view) /* For now scissor is expected by region drawing, we could disable it * and do the enable/disable in the specific cases that setup scissor. */ glEnable(GL_SCISSOR_TEST); - glScissor(0, 0, region->winx, region->winy); + GPU_scissor(0, 0, region->winx, region->winy); } region->draw_buffer->bound_view = view; diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 6aeabf3a0ae..74e1c495a00 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -1061,7 +1061,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) ps->zoom = MIN2(zoomx, zoomy); GPU_viewport(0, 0, ps->win_x, ps->win_y); - glScissor(0, 0, ps->win_x, ps->win_y); + GPU_scissor(0, 0, ps->win_x, ps->win_y); playanim_gl_matrix(); @@ -1323,7 +1323,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv) int win_x, win_y; playanim_window_get_size(&win_x, &win_y); GPU_viewport(0, 0, win_x, win_y); - glScissor(0, 0, win_x, win_y); + GPU_scissor(0, 0, win_x, win_y); playanim_gl_matrix(); GHOST_SwapWindowBuffers(g_WS.ghost_window); diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 490f45b270f..477579ed620 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -41,7 +41,7 @@ void wmViewport(const rcti *winrct) int height = BLI_rcti_size_y(winrct) + 1; GPU_viewport(winrct->xmin, winrct->ymin, width, height); - glScissor(winrct->xmin, winrct->ymin, width, height); + GPU_scissor(winrct->xmin, winrct->ymin, width, height); wmOrtho2_pixelspace(width, height); GPU_matrix_identity_set(); @@ -80,7 +80,7 @@ void wmPartialViewport(rcti *drawrct, const rcti *winrct, const rcti *partialrct } GPU_viewport(0, 0, width, height); - glScissor(x, y, scissor_width, scissor_height); + GPU_scissor(x, y, scissor_width, scissor_height); wmOrtho2_pixelspace(width, height); GPU_matrix_identity_set(); @@ -92,7 +92,7 @@ void wmWindowViewport(wmWindow *win) int height = WM_window_pixels_y(win); GPU_viewport(0, 0, width, height); - glScissor(0, 0, width, height); + GPU_scissor(0, 0, width, height); wmOrtho2_pixelspace(width, height); GPU_matrix_identity_set(); |