From 298329554a5a0ae40bc4a64ca9c1490d22edc947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sun, 16 Aug 2020 16:48:21 +0200 Subject: Cleanup: GPUState: remove double GPU_blend calls --- source/blender/windowmanager/intern/wm_draw.c | 3 +-- source/blender/windowmanager/intern/wm_gesture.c | 1 - source/blender/windowmanager/intern/wm_playanim.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/windowmanager/intern') diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index d5e175b8cb4..6f3fbf77987 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -576,8 +576,7 @@ void wm_draw_region_blend(ARegion *region, int view, bool blend) const float rectg[4] = {rect_geo.xmin, rect_geo.ymin, rect_geo.xmax, rect_geo.ymax}; if (blend) { - /* GL_ONE because regions drawn offscreen have premultiplied alpha. */ - GPU_blend(GPU_BLEND_ALPHA); + /* Regions drawn offscreen have premultiplied alpha. */ GPU_blend(GPU_BLEND_ALPHA_PREMULT); } diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index d73da935626..67733ffc673 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -353,7 +353,6 @@ static void draw_filled_lasso(wmGesture *gt) draw_filled_lasso_px_cb, &lasso_fill_data); - GPU_blend(GPU_BLEND_ALPHA); GPU_blend(GPU_BLEND_ADDITIVE); IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR); diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 2f949142eb7..9d472ed4597 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -316,7 +316,6 @@ static void playanim_toscreen( /* checkerboard for case alpha */ if (ibuf->planes == 32) { GPU_blend(GPU_BLEND_ALPHA); - GPU_blend(GPU_BLEND_ALPHA); imm_draw_box_checker_2d_ex(offs_x, offs_y, -- cgit v1.2.3