From e553408bee693d7cbff1b359af330f4963d2db12 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 23 Jun 2020 14:49:12 +0200 Subject: Fix T77803: IK Degrees of freedom drawing glitch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forgot to update the lineOutput what resulted in that the sphere was not rendered on all platforms. Reviewed By: Clément Foucault Differential Revision: https://developer.blender.org/D8098 --- source/blender/draw/CMakeLists.txt | 1 + source/blender/draw/engines/overlay/overlay_shader.c | 3 ++- .../draw/engines/overlay/shaders/armature_dof_solid_frag.glsl | 11 +++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 source/blender/draw/engines/overlay/shaders/armature_dof_solid_frag.glsl (limited to 'source') diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 0214a8e1887..7ef875f4d4c 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -309,6 +309,7 @@ data_to_c_simple(engines/basic/shaders/conservative_depth_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/antialiasing_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/antialiasing_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/armature_dof_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_dof_solid_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/armature_envelope_outline_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/armature_envelope_solid_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/armature_envelope_solid_vert.glsl SRC) diff --git a/source/blender/draw/engines/overlay/overlay_shader.c b/source/blender/draw/engines/overlay/overlay_shader.c index ddb1a523140..edf91c99531 100644 --- a/source/blender/draw/engines/overlay/overlay_shader.c +++ b/source/blender/draw/engines/overlay/overlay_shader.c @@ -31,6 +31,7 @@ extern char datatoc_antialiasing_frag_glsl[]; extern char datatoc_antialiasing_vert_glsl[]; extern char datatoc_armature_dof_vert_glsl[]; +extern char datatoc_armature_dof_solid_frag_glsl[]; extern char datatoc_armature_envelope_distance_frag_glsl[]; extern char datatoc_armature_envelope_outline_vert_glsl[]; extern char datatoc_armature_envelope_solid_frag_glsl[]; @@ -507,7 +508,7 @@ GPUShader *OVERLAY_shader_armature_degrees_of_freedom_solid(void) datatoc_armature_dof_vert_glsl, NULL}, .frag = (const char *[]){datatoc_common_view_lib_glsl, - datatoc_gpu_shader_flat_color_frag_glsl, + datatoc_armature_dof_solid_frag_glsl, NULL}, .defs = (const char *[]){sh_cfg->def, NULL}, }); diff --git a/source/blender/draw/engines/overlay/shaders/armature_dof_solid_frag.glsl b/source/blender/draw/engines/overlay/shaders/armature_dof_solid_frag.glsl new file mode 100644 index 00000000000..e511aab69c1 --- /dev/null +++ b/source/blender/draw/engines/overlay/shaders/armature_dof_solid_frag.glsl @@ -0,0 +1,11 @@ + +flat in vec4 finalColor; + +layout(location = 0) out vec4 fragColor; +layout(location = 1) out vec4 lineOutput; + +void main() +{ + fragColor = finalColor; + lineOutput = vec4(0.0); +} -- cgit v1.2.3