diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-04 22:57:55 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-05 00:32:17 +0300 |
| commit | a77fe7eb5c34d859cc18fc942a1167116b7a8c9e (patch) | |
| tree | 8c2cd81dccd25dd5420d82e11f9bcf3a73566863 /source/blender/draw/engines/overlay/overlay_shader.c | |
| parent | 6d3eb85f66ae93d9d4859ef3264f1a1b2ae4fa36 (diff) | |
Overlay Engine: Outline: Simplify drawing code
Use obinfo ubo to compute outline color id.
Note this commit removes the planar probe outline on purpose.
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_shader.c')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_shader.c | 3 |
1 files changed, 3 insertions, 0 deletions
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}, |