diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-17 20:03:30 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-18 04:43:52 +0300 |
commit | a6bd7777c20aa229ae9c4cdd537e94cf8a9c7edf (patch) | |
tree | 839f559613038d8ec17e18b7bc85b1a231bf01a4 /source/blender/windowmanager | |
parent | 35f1b3e43b37006486b94675466cf4260087e269 (diff) |
Cleanup: GPU: Encapsulate glViewport calls
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.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_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index e7cb1c00605..eee93fc9459 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -209,7 +209,7 @@ static void wm_gesture_draw_line(wmGesture *gt) immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR); float viewport_size[4]; - glGetFloatv(GL_VIEWPORT, viewport_size); + GPU_viewport_size_get_f(viewport_size); immUniform2f("viewport_size", viewport_size[2], viewport_size[3]); immUniform1i("colors_len", 2); /* "advanced" mode */ @@ -252,7 +252,7 @@ static void wm_gesture_draw_rect(wmGesture *gt) immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR); float viewport_size[4]; - glGetFloatv(GL_VIEWPORT, viewport_size); + GPU_viewport_size_get_f(viewport_size); immUniform2f("viewport_size", viewport_size[2], viewport_size[3]); immUniform1i("colors_len", 2); /* "advanced" mode */ @@ -291,7 +291,7 @@ static void wm_gesture_draw_circle(wmGesture *gt) immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR); float viewport_size[4]; - glGetFloatv(GL_VIEWPORT, viewport_size); + GPU_viewport_size_get_f(viewport_size); immUniform2f("viewport_size", viewport_size[2], viewport_size[3]); immUniform1i("colors_len", 2); /* "advanced" mode */ @@ -408,7 +408,7 @@ static void wm_gesture_draw_lasso(wmGesture *gt, bool filled) immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR); float viewport_size[4]; - glGetFloatv(GL_VIEWPORT, viewport_size); + GPU_viewport_size_get_f(viewport_size); immUniform2f("viewport_size", viewport_size[2], viewport_size[3]); immUniform1i("colors_len", 2); /* "advanced" mode */ @@ -442,7 +442,7 @@ static void wm_gesture_draw_cross(wmWindow *win, wmGesture *gt) immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR); float viewport_size[4]; - glGetFloatv(GL_VIEWPORT, viewport_size); + GPU_viewport_size_get_f(viewport_size); immUniform2f("viewport_size", viewport_size[2], viewport_size[3]); immUniform1i("colors_len", 2); /* "advanced" mode */ diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index bdc61153f07..6aeabf3a0ae 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -1060,7 +1060,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) /* zoom always show entire image */ ps->zoom = MIN2(zoomx, zoomy); - glViewport(0, 0, ps->win_x, ps->win_y); + GPU_viewport(0, 0, ps->win_x, ps->win_y); glScissor(0, 0, ps->win_x, ps->win_y); playanim_gl_matrix(); @@ -1322,7 +1322,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); - glViewport(0, 0, win_x, win_y); + GPU_viewport(0, 0, win_x, win_y); glScissor(0, 0, win_x, win_y); playanim_gl_matrix(); diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 5483d79c075..490f45b270f 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -40,7 +40,7 @@ void wmViewport(const rcti *winrct) int width = BLI_rcti_size_x(winrct) + 1; int height = BLI_rcti_size_y(winrct) + 1; - glViewport(winrct->xmin, winrct->ymin, width, height); + GPU_viewport(winrct->xmin, winrct->ymin, width, height); glScissor(winrct->xmin, winrct->ymin, width, height); wmOrtho2_pixelspace(width, height); @@ -79,7 +79,7 @@ void wmPartialViewport(rcti *drawrct, const rcti *winrct, const rcti *partialrct scissor_height += 1; } - glViewport(0, 0, width, height); + GPU_viewport(0, 0, width, height); glScissor(x, y, scissor_width, scissor_height); wmOrtho2_pixelspace(width, height); @@ -91,7 +91,7 @@ void wmWindowViewport(wmWindow *win) int width = WM_window_pixels_x(win); int height = WM_window_pixels_y(win); - glViewport(0, 0, width, height); + GPU_viewport(0, 0, width, height); glScissor(0, 0, width, height); wmOrtho2_pixelspace(width, height); |