diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-06-03 11:53:21 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-06-03 12:02:56 +0300 |
| commit | d4f1efad00566ddc22dc3c99a67456e57e1bcb7c (patch) | |
| tree | 31538aa7f0c63df2de0151f3d692b3d42c6a05b1 /source/blender/draw/engines/eevee/eevee_depth_of_field.c | |
| parent | 3e4c8d48aab3de9211652d43f4275576dae146ce (diff) | |
DRW: Remove use of builtin matrices and replace by common_view_lib
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_depth_of_field.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_depth_of_field.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c index ec6770e4549..4a3cc36ddef 100644 --- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c +++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c @@ -31,6 +31,8 @@ #include "BKE_camera.h" +#include "BLI_string_utils.h" + #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -48,24 +50,28 @@ static struct { extern char datatoc_effect_dof_vert_glsl[]; extern char datatoc_effect_dof_frag_glsl[]; +extern char datatoc_common_view_lib_glsl[]; + static void eevee_create_shader_depth_of_field(const bool use_alpha) { + char *frag = BLI_string_joinN(datatoc_common_view_lib_glsl, datatoc_effect_dof_frag_glsl); e_data.dof_downsample_sh[use_alpha] = DRW_shader_create_fullscreen( - datatoc_effect_dof_frag_glsl, + frag, use_alpha ? "#define USE_ALPHA_DOF\n" "#define STEP_DOWNSAMPLE\n" : "#define STEP_DOWNSAMPLE\n"); e_data.dof_scatter_sh[use_alpha] = DRW_shader_create(datatoc_effect_dof_vert_glsl, NULL, - datatoc_effect_dof_frag_glsl, + frag, use_alpha ? "#define USE_ALPHA_DOF\n" "#define STEP_SCATTER\n" : "#define STEP_SCATTER\n"); - e_data.dof_resolve_sh[use_alpha] = DRW_shader_create_fullscreen(datatoc_effect_dof_frag_glsl, + e_data.dof_resolve_sh[use_alpha] = DRW_shader_create_fullscreen(frag, use_alpha ? "#define USE_ALPHA_DOF\n" "#define STEP_RESOLVE\n" : "#define STEP_RESOLVE\n"); + MEM_freeN(frag); } int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *UNUSED(sldata), |