diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-02-24 03:23:55 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-02-24 15:48:38 +0300 |
commit | 8955b8b99209eb5fe8547b335161db7e4cb932b2 (patch) | |
tree | 5df66c2eb93ebfaae9c612962db6023c0d178f08 /source/blender/draw/engines/workbench/workbench_forward.c | |
parent | ed21506f2634a863c4ebfddf75754c9adb66ca3b (diff) |
Cleanup: Workbench: Remove checkerboard depth
This is not needed anymore with the new overlay xray fading.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_forward.c')
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index fff01f9618c..f2cc7cdf573 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -56,7 +56,6 @@ static struct { WORKBENCH_FORWARD_Shaders sh_data[GPU_SHADER_CFG_LEN]; struct GPUShader *composite_sh_cache[2]; - struct GPUShader *checker_depth_sh; struct GPUTexture *object_id_tx; /* ref only, not alloced */ struct GPUTexture *transparent_accum_tx; /* ref only, not alloced */ @@ -72,7 +71,6 @@ extern char datatoc_workbench_forward_composite_frag_glsl[]; extern char datatoc_workbench_forward_depth_frag_glsl[]; extern char datatoc_workbench_forward_transparent_accum_frag_glsl[]; extern char datatoc_workbench_data_lib_glsl[]; -extern char datatoc_workbench_checkerboard_depth_frag_glsl[]; extern char datatoc_workbench_object_outline_lib_glsl[]; extern char datatoc_workbench_curvature_lib_glsl[]; extern char datatoc_workbench_prepass_vert_glsl[]; @@ -349,11 +347,6 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata) WORKBENCH_PrivateData *wpd = stl->g_data; workbench_private_data_init(wpd); - if (!e_data.checker_depth_sh) { - e_data.checker_depth_sh = DRW_shader_create_fullscreen( - datatoc_workbench_checkerboard_depth_frag_glsl, NULL); - } - workbench_forward_outline_shaders_ensure(wpd, draw_ctx->sh_cfg); workbench_volume_engine_init(); @@ -438,31 +431,9 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata) workbench_aa_create_pass(vedata, &e_data.transparent_accum_tx); } - /* Checker Depth */ - { - static float noise_offset = 0.0f; - float blend_threshold = 0.0f; - - if (DRW_state_is_image_render()) { - /* TODO: Should be based on the number of samples used for render. */ - noise_offset = fmodf(noise_offset + 1.0f / 8.0f, 1.0f); - } - - if (XRAY_ENABLED(wpd)) { - blend_threshold = 1.0f - XRAY_ALPHA(wpd) * 0.9f; - } - - if (wpd->shading.type == OB_WIRE) { - wpd->shading.xray_alpha = 0.0f; - wpd->shading.xray_alpha_wire = 0.0f; - } - - int state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_ALWAYS; - psl->checker_depth_pass = DRW_pass_create("Checker Depth", state); - grp = DRW_shgroup_create(e_data.checker_depth_sh, psl->checker_depth_pass); - // DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL); - DRW_shgroup_uniform_float_copy(grp, "threshold", blend_threshold); - DRW_shgroup_uniform_float_copy(grp, "offset", noise_offset); + if (wpd->shading.type == OB_WIRE) { + wpd->shading.xray_alpha = 0.0f; + wpd->shading.xray_alpha_wire = 0.0f; } } @@ -481,7 +452,6 @@ void workbench_forward_engine_free() for (int index = 0; index < 2; index++) { DRW_SHADER_FREE_SAFE(e_data.composite_sh_cache[index]); } - DRW_SHADER_FREE_SAFE(e_data.checker_depth_sh); workbench_volume_engine_free(); workbench_fxaa_engine_free(); @@ -828,10 +798,6 @@ void workbench_forward_draw_scene(WORKBENCH_Data *vedata) /* Color correct and Anti aliasing */ workbench_aa_draw_pass(vedata, e_data.composite_buffer_tx); - - /* Apply checker pattern */ - GPU_framebuffer_bind(dfbl->depth_only_fb); - DRW_draw_pass(psl->checker_depth_pass); } void workbench_forward_draw_finish(WORKBENCH_Data *vedata) |