diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-16 19:08:21 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-18 04:43:51 +0300 |
commit | acad0d75b1448550c863ac8002bba4284d30d10d (patch) | |
tree | d1b5e8a0e2375087687db3d67e05716dec38633d /source/blender/editors | |
parent | 3d536f69f6914882117bd0905f42a7be442975d2 (diff) |
Cleanup: GPU: Replace glBlendFunc by GPU equivalent
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 3 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_draw.c | 6 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index a695d2e4cf2..579b5929c15 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -1761,7 +1761,8 @@ void ED_gpencil_brush_draw_eraser(Brush *brush, int x, int y) GPU_line_smooth(true); GPU_blend(true); - glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + GPU_blend_set_func_separate( + GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); immUniformColor4ub(255, 100, 100, 20); imm_draw_circle_fill_2d(shdr_pos, x, y, radius, 40); diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 720a5bcff37..98419b0b0ac 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -867,7 +867,7 @@ static void histogram_draw_one(float r, } GPU_line_smooth(true); - glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ONE, GL_ONE); + GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE, GPU_ONE, GPU_ONE); immUniformColor4fv(color); @@ -1168,7 +1168,7 @@ void ui_draw_but_WAVEFORM(ARegion *UNUSED(region), } if (scopes->ok && scopes->waveform_1 != NULL) { - glBlendFunc(GL_ONE, GL_ONE); + GPU_blend_set_func(GPU_ONE, GPU_ONE); GPU_point_size(1.0); /* LUMA (1 channel) */ @@ -1468,7 +1468,7 @@ void ui_draw_but_VECTORSCOPE(ARegion *UNUSED(region), /* pixel point cloud */ float col[3] = {alpha, alpha, alpha}; - glBlendFunc(GL_ONE, GL_ONE); + GPU_blend_set_func(GPU_ONE, GPU_ONE); GPU_point_size(1.0); GPU_matrix_push(); diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index d8859ec8532..f87f631c643 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -135,7 +135,7 @@ static void region_draw_emboss(const ARegion *region, const rcti *scirct, int si immUnbindProgram(); GPU_blend(false); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GPU_blend_set_func(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA); } void ED_region_pixelspace(ARegion *region) |