diff options
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_effect_dof.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_effect_dof.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c index abbca0988d4..fcee8c270dd 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_dof.c +++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c @@ -156,7 +156,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata) const float *full_size = DRW_viewport_size_get(); const int size[2] = {max_ii(1, (int)full_size[0] / 2), max_ii(1, (int)full_size[1] / 2)}; -#if 0 /* TODO(fclem) finish COC min_max optimisation */ +#if 0 /* TODO(fclem): finish COC min_max optimization. */ /* NOTE: We Ceil here in order to not miss any edge texel if using a NPO2 texture. */ int shrink_h_size[2] = {ceilf(size[0] / 8.0f), size[1]}; int shrink_w_size[2] = {shrink_h_size[0], ceilf(size[1] / 8.0f)}; @@ -168,7 +168,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata) &txl->coc_halfres_tx, size[0], size[1], GPU_RG8, DRW_TEX_FILTER | DRW_TEX_MIPMAP); wpd->dof_blur_tx = DRW_texture_pool_query_2d( size[0], size[1], GPU_RGBA16F, &draw_engine_workbench); -#if 0 /* TODO(fclem) finish COC min_max optimisation */ +#if 0 /* TODO(fclem): finish COC min_max optimization. */ wpd->coc_temp_tx = DRW_texture_pool_query_2d( shrink_h_size[0], shrink_h_size[1], GPU_RG8, &draw_engine_workbench); wpd->coc_tiles_tx[0] = DRW_texture_pool_query_2d( @@ -183,7 +183,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata) GPU_ATTACHMENT_TEXTURE(txl->dof_source_tx), GPU_ATTACHMENT_TEXTURE(txl->coc_halfres_tx), }); -#if 0 /* TODO(fclem) finish COC min_max optimisation */ +#if 0 /* TODO(fclem): finish COC min_max optimization. */ GPU_framebuffer_ensure_config(&fbl->dof_coc_tile_h_fb, { GPU_ATTACHMENT_NONE, @@ -218,7 +218,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata) float focus_dist = BKE_camera_object_dof_distance(camera); float focal_len = cam->lens; - /* TODO(fclem) deduplicate with eevee */ + /* TODO(fclem): deduplicate with eevee */ const float scale_camera = 0.001f; /* we want radius here for the aperture number */ float aperture = 0.5f * scale_camera * focal_len / fstop; @@ -286,11 +286,11 @@ void workbench_dof_cache_init(WORKBENCH_Data *vedata) psl->dof_down2_ps = DRW_pass_create("DoF DownSample", DRW_STATE_WRITE_COLOR); DRWShadingGroup *grp = DRW_shgroup_create(downsample_sh, psl->dof_down2_ps); - DRW_shgroup_uniform_texture(grp, "sceneColorTex", txl->dof_source_tx); + DRW_shgroup_uniform_texture_ex(grp, "sceneColorTex", txl->dof_source_tx, GPU_SAMPLER_DEFAULT); DRW_shgroup_uniform_texture(grp, "inputCocTex", txl->coc_halfres_tx); DRW_shgroup_call_procedural_triangles(grp, NULL, 1); } -#if 0 /* TODO(fclem) finish COC min_max optimization */ +#if 0 /* TODO(fclem): finish COC min_max optimization */ { psl->dof_flatten_h_ps = DRW_pass_create("DoF Flatten Coc H", DRW_STATE_WRITE_COLOR); @@ -385,7 +385,7 @@ void workbench_dof_draw_pass(WORKBENCH_Data *vedata) GPU_framebuffer_recursive_downsample( fbl->dof_downsample_fb, 2, workbench_dof_downsample_level, psl); -#if 0 /* TODO(fclem) finish COC min_max optimization */ +#if 0 /* TODO(fclem): finish COC min_max optimization */ GPU_framebuffer_bind(fbl->dof_coc_tile_h_fb); DRW_draw_pass(psl->dof_flatten_h_ps); |