diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-28 00:21:39 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-28 15:22:22 +0300 |
| commit | e0c1116ce3dfef8415b7a975e82cd1506383ed9c (patch) | |
| tree | 5e1aac7b4ed95890e8025ef28ef8147338eeb861 /source/blender/draw/engines/workbench | |
| parent | 2e211d099f8d13b79cdf9057f77532c587311c3d (diff) | |
Cleanup: DRW: Rename DRW_STATE_BLEND_* for API clarity
Diffstat (limited to 'source/blender/draw/engines/workbench')
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index 28104a87b9a..3e442ce2125 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -755,9 +755,9 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata) /* Stencil Shadow passes. */ #ifdef DEBUG_SHADOW_VOLUME DRWState depth_pass_state = DRW_STATE_DEPTH_LESS | DRW_STATE_WRITE_COLOR | - DRW_STATE_ADDITIVE; + DRW_STATE_BLEND_ADD; DRWState depth_fail_state = DRW_STATE_DEPTH_GREATER_EQUAL | DRW_STATE_WRITE_COLOR | - DRW_STATE_ADDITIVE; + DRW_STATE_BLEND_ADD; #else DRWState depth_pass_state = DRW_STATE_DEPTH_LESS | DRW_STATE_WRITE_STENCIL_SHADOW_PASS; DRWState depth_fail_state = DRW_STATE_DEPTH_LESS | DRW_STATE_WRITE_STENCIL_SHADOW_FAIL; @@ -830,7 +830,7 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata) } /* OIT Composite */ { - int state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND; + int state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA; psl->oit_composite_pass = DRW_pass_create("OIT Composite", state); grp = DRW_shgroup_create(e_data.oit_resolve_sh, psl->oit_composite_pass); diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c index e24536759db..69d0500f155 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_dof.c +++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c @@ -298,7 +298,8 @@ void workbench_dof_create_pass(WORKBENCH_Data *vedata, psl->dof_dilate_v_ps = DRW_pass_create("DoF Dilate Coc V", DRW_STATE_WRITE_COLOR); psl->dof_blur1_ps = DRW_pass_create("DoF Blur 1", DRW_STATE_WRITE_COLOR); psl->dof_blur2_ps = DRW_pass_create("DoF Blur 2", DRW_STATE_WRITE_COLOR); - psl->dof_resolve_ps = DRW_pass_create("DoF Resolve", DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND); + psl->dof_resolve_ps = DRW_pass_create("DoF Resolve", + DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA); { DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_prepare_sh, psl->dof_down_ps); diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c index 2b5fc8c0e47..a2fdf35109b 100644 --- a/source/blender/draw/engines/workbench/workbench_volume.c +++ b/source/blender/draw/engines/workbench/workbench_volume.c @@ -111,7 +111,7 @@ void workbench_volume_engine_free(void) void workbench_volume_cache_init(WORKBENCH_Data *vedata) { vedata->psl->volume_pass = DRW_pass_create( - "Volumes", DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_PREMUL | DRW_STATE_CULL_FRONT); + "Volumes", DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA_PREMUL | DRW_STATE_CULL_FRONT); } void workbench_volume_cache_populate(WORKBENCH_Data *vedata, |