diff options
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_shader_fx.c')
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_shader_fx.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index e4819f48eb1..b1bc796bfa7 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -457,8 +457,8 @@ static void DRW_gpencil_fx_shadow( GPUBatch *fxquad = DRW_cache_fullscreen_quad_get(); /* prepare pass */ fx_shgrp = DRW_shgroup_create( - e_data->gpencil_fx_shadow_prepare_sh, - psl->fx_shader_pass_blend); + e_data->gpencil_fx_shadow_prepare_sh, + psl->fx_shader_pass_blend); DRW_shgroup_call_add(fx_shgrp, fxquad, NULL); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a); @@ -494,8 +494,8 @@ static void DRW_gpencil_fx_shadow( /* blur pass */ fx_shgrp = DRW_shgroup_create( - e_data->gpencil_fx_blur_sh, - psl->fx_shader_pass_blend); + e_data->gpencil_fx_blur_sh, + psl->fx_shader_pass_blend); DRW_shgroup_call_add(fx_shgrp, fxquad, NULL); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_fx); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_fx); @@ -510,8 +510,8 @@ static void DRW_gpencil_fx_shadow( /* resolve pass */ fx_shgrp = DRW_shgroup_create( - e_data->gpencil_fx_shadow_resolve_sh, - psl->fx_shader_pass_blend); + e_data->gpencil_fx_shadow_resolve_sh, + psl->fx_shader_pass_blend); DRW_shgroup_call_add(fx_shgrp, fxquad, NULL); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a); @@ -540,8 +540,8 @@ static void DRW_gpencil_fx_glow( GPUBatch *fxquad = DRW_cache_fullscreen_quad_get(); /* prepare pass */ fx_shgrp = DRW_shgroup_create( - e_data->gpencil_fx_glow_prepare_sh, - psl->fx_shader_pass_blend); + e_data->gpencil_fx_glow_prepare_sh, + psl->fx_shader_pass_blend); DRW_shgroup_call_add(fx_shgrp, fxquad, NULL); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a); @@ -555,8 +555,8 @@ static void DRW_gpencil_fx_glow( /* blur pass */ fx_shgrp = DRW_shgroup_create( - e_data->gpencil_fx_blur_sh, - psl->fx_shader_pass_blend); + e_data->gpencil_fx_blur_sh, + psl->fx_shader_pass_blend); DRW_shgroup_call_add(fx_shgrp, fxquad, NULL); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_fx); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_fx); @@ -571,8 +571,8 @@ static void DRW_gpencil_fx_glow( /* resolve pass */ fx_shgrp = DRW_shgroup_create( - e_data->gpencil_fx_glow_resolve_sh, - psl->fx_shader_pass_blend); + e_data->gpencil_fx_glow_resolve_sh, + psl->fx_shader_pass_blend); DRW_shgroup_call_add(fx_shgrp, fxquad, NULL); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a); DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a); @@ -659,52 +659,52 @@ void GPENCIL_create_fx_shaders(GPENCIL_e_data *e_data) /* fx shaders (all in screen space) */ if (!e_data->gpencil_fx_blur_sh) { e_data->gpencil_fx_blur_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_blur_frag_glsl, NULL); + datatoc_gpencil_fx_blur_frag_glsl, NULL); } if (!e_data->gpencil_fx_colorize_sh) { e_data->gpencil_fx_colorize_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_colorize_frag_glsl, NULL); + datatoc_gpencil_fx_colorize_frag_glsl, NULL); } if (!e_data->gpencil_fx_flip_sh) { e_data->gpencil_fx_flip_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_flip_frag_glsl, NULL); + datatoc_gpencil_fx_flip_frag_glsl, NULL); } if (!e_data->gpencil_fx_light_sh) { e_data->gpencil_fx_light_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_light_frag_glsl, NULL); + datatoc_gpencil_fx_light_frag_glsl, NULL); } if (!e_data->gpencil_fx_pixel_sh) { e_data->gpencil_fx_pixel_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_pixel_frag_glsl, NULL); + datatoc_gpencil_fx_pixel_frag_glsl, NULL); } if (!e_data->gpencil_fx_rim_prepare_sh) { e_data->gpencil_fx_rim_prepare_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_rim_prepare_frag_glsl, NULL); + datatoc_gpencil_fx_rim_prepare_frag_glsl, NULL); e_data->gpencil_fx_rim_resolve_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_rim_resolve_frag_glsl, NULL); + datatoc_gpencil_fx_rim_resolve_frag_glsl, NULL); } if (!e_data->gpencil_fx_shadow_prepare_sh) { e_data->gpencil_fx_shadow_prepare_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_shadow_prepare_frag_glsl, NULL); + datatoc_gpencil_fx_shadow_prepare_frag_glsl, NULL); e_data->gpencil_fx_shadow_resolve_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_shadow_resolve_frag_glsl, NULL); + datatoc_gpencil_fx_shadow_resolve_frag_glsl, NULL); } if (!e_data->gpencil_fx_glow_prepare_sh) { e_data->gpencil_fx_glow_prepare_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_glow_prepare_frag_glsl, NULL); + datatoc_gpencil_fx_glow_prepare_frag_glsl, NULL); e_data->gpencil_fx_glow_resolve_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_glow_resolve_frag_glsl, NULL); + datatoc_gpencil_fx_glow_resolve_frag_glsl, NULL); } if (!e_data->gpencil_fx_swirl_sh) { e_data->gpencil_fx_swirl_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_swirl_frag_glsl, NULL); + datatoc_gpencil_fx_swirl_frag_glsl, NULL); } if (!e_data->gpencil_fx_wave_sh) { e_data->gpencil_fx_wave_sh = DRW_shader_create_fullscreen( - datatoc_gpencil_fx_wave_frag_glsl, NULL); + datatoc_gpencil_fx_wave_frag_glsl, NULL); } } @@ -880,8 +880,9 @@ static void draw_gpencil_midpass_blur( GPU_framebuffer_bind(fbl->temp_fb_b); GPU_framebuffer_clear_color_depth(fbl->temp_fb_b, clearcol, 1.0f); - DRW_draw_pass_subset(psl->fx_shader_pass_blend, - runtime->fx_sh_b, runtime->fx_sh_b); + DRW_draw_pass_subset( + psl->fx_shader_pass_blend, + runtime->fx_sh_b, runtime->fx_sh_b); /* copy pass from b for ping-pong frame buffers */ GPU_framebuffer_bind(fbl->temp_fb_fx); @@ -981,8 +982,8 @@ static void draw_gpencil_shadow_passes( GPU_framebuffer_bind(fbl->temp_fb_fx); GPU_framebuffer_clear_color_depth(fbl->temp_fb_fx, clearcol, 1.0f); DRW_draw_pass_subset( - psl->fx_shader_pass_blend, - fxd->runtime.fx_sh, fxd->runtime.fx_sh); + psl->fx_shader_pass_blend, + fxd->runtime.fx_sh, fxd->runtime.fx_sh); /* blur shadow */ draw_gpencil_do_blur( @@ -995,8 +996,8 @@ static void draw_gpencil_shadow_passes( GPU_framebuffer_bind(fbl->temp_fb_b); GPU_framebuffer_clear_color_depth(fbl->temp_fb_b, clearcol, 1.0f); DRW_draw_pass_subset( - psl->fx_shader_pass_blend, - fxd->runtime.fx_sh_c, fxd->runtime.fx_sh_c); + psl->fx_shader_pass_blend, + fxd->runtime.fx_sh_c, fxd->runtime.fx_sh_c); /* copy pass from b to a for ping-pong frame buffers */ e_data->input_depth_tx = e_data->temp_depth_tx_b; @@ -1026,8 +1027,8 @@ static void draw_gpencil_glow_passes( GPU_framebuffer_bind(fbl->temp_fb_fx); GPU_framebuffer_clear_color_depth(fbl->temp_fb_fx, clearcol, 1.0f); DRW_draw_pass_subset( - psl->fx_shader_pass_blend, - fxd->runtime.fx_sh, fxd->runtime.fx_sh); + psl->fx_shader_pass_blend, + fxd->runtime.fx_sh, fxd->runtime.fx_sh); /* blur glow */ draw_gpencil_do_blur( @@ -1044,8 +1045,8 @@ static void draw_gpencil_glow_passes( fxd->blur[1] = (fxd->flag & FX_GLOW_USE_ALPHA) ? 1 : 0; DRW_draw_pass_subset( - psl->fx_shader_pass_blend, - fxd->runtime.fx_sh_c, fxd->runtime.fx_sh_c); + psl->fx_shader_pass_blend, + fxd->runtime.fx_sh_c, fxd->runtime.fx_sh_c); /* copy pass from b to a for ping-pong frame buffers */ e_data->input_depth_tx = e_data->temp_depth_tx_b; |