From a77fe7eb5c34d859cc18fc942a1167116b7a8c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 4 Dec 2019 20:57:55 +0100 Subject: Overlay Engine: Outline: Simplify drawing code Use obinfo ubo to compute outline color id. Note this commit removes the planar probe outline on purpose. --- source/blender/draw/engines/overlay/overlay_shader.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/draw/engines/overlay/overlay_shader.c') diff --git a/source/blender/draw/engines/overlay/overlay_shader.c b/source/blender/draw/engines/overlay/overlay_shader.c index db1d97544c0..5e97ddacbb0 100644 --- a/source/blender/draw/engines/overlay/overlay_shader.c +++ b/source/blender/draw/engines/overlay/overlay_shader.c @@ -893,6 +893,7 @@ GPUShader *OVERLAY_shader_outline_prepass(bool use_wire) sh_data->outline_prepass_wire = GPU_shader_create_from_arrays({ .vert = (const char *[]){sh_cfg->lib, datatoc_common_view_lib_glsl, + datatoc_gpu_shader_common_obinfos_lib_glsl, datatoc_outline_prepass_vert_glsl, NULL}, .geom = (const char *[]){sh_cfg->lib, @@ -907,6 +908,7 @@ GPUShader *OVERLAY_shader_outline_prepass(bool use_wire) sh_data->outline_prepass = GPU_shader_create_from_arrays({ .vert = (const char *[]){sh_cfg->lib, datatoc_common_view_lib_glsl, + datatoc_gpu_shader_common_obinfos_lib_glsl, datatoc_outline_prepass_vert_glsl, NULL}, .frag = (const char *[]){datatoc_outline_prepass_frag_glsl, NULL}, @@ -926,6 +928,7 @@ GPUShader *OVERLAY_shader_outline_prepass_grid(void) .vert = (const char *[]){sh_cfg->lib, datatoc_common_view_lib_glsl, datatoc_common_globals_lib_glsl, + datatoc_gpu_shader_common_obinfos_lib_glsl, datatoc_outline_lightprobe_grid_vert_glsl, NULL}, .frag = (const char *[]){datatoc_outline_prepass_frag_glsl, NULL}, -- cgit v1.2.3