blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 743 Projects 19 Wiki Activity

Cleanup: GPU: Replace glBlendFunc by GPU equivalent

This commit is contained in:
Clément Foucault 2020-07-16 18:08:21 +02:00
parent 3d536f69f6
commit acad0d75b1
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/gpencil/gpencil_utils.c
View File

@ -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);

6
source/blender/editors/interface/interface_draw.c
View File

@ -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();

2
source/blender/editors/screen/area.c
View File

@ -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)

4
source/blender/windowmanager/intern/wm_gesture.c
View File

@ -355,7 +355,7 @@ static void draw_filled_lasso(wmGesture *gt)
/* Additive Blending */
GPU_blend(true);
glBlendFunc(GL_ONE, GL_ONE);
GPU_blend_set_func(GPU_ONE, GPU_ONE);
GLint unpack_alignment;
glGetIntegerv(GL_UNPACK_ALIGNMENT, &unpack_alignment);
@ -387,7 +387,7 @@ static void draw_filled_lasso(wmGesture *gt)
MEM_freeN(pixel_buf);
GPU_blend(false);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
GPU_blend_set_func(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA);
}
MEM_freeN(mcoords);

2
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -351,7 +351,7 @@ void WM_init(bContext *C, int argc, const char **argv)
BKE_material_copybuf_clear();
ED_render_clear_mtex_copybuf();
// glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
// GPU_blend_set_func(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
wm_history_file_read();

3
source/blender/windowmanager/intern/wm_playanim.c
View File

@ -316,7 +316,8 @@ static void playanim_toscreen(
/* checkerboard for case alpha */
if (ibuf->planes == 32) {
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);
imm_draw_box_checker_2d_ex(offs_x,
offs_y,