From d078c465ee7c239f94f0f97c873c36309c81806f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 22 Apr 2020 11:51:21 +0200 Subject: [PATCH] Reduce branches in shader. part of the further fallout of CURA-7147 --- resources/shaders/overhang.shader | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/resources/shaders/overhang.shader b/resources/shaders/overhang.shader index c3106a4e14..4add78b531 100644 --- a/resources/shaders/overhang.shader +++ b/resources/shaders/overhang.shader @@ -68,11 +68,9 @@ fragment = finalColor = (-normal.y > u_overhangAngle) ? u_overhangColor : finalColor; - if(u_renderError > 0.5) - { - vec3 grid = vec3(f_vertex.x - floor(f_vertex.x - 0.5), f_vertex.y - floor(f_vertex.y - 0.5), f_vertex.z - floor(f_vertex.z - 0.5)); - finalColor.a = dot(grid, grid) < 0.245 ? 0.667 : 1.0; - } + vec3 grid = vec3(f_vertex.x - floor(f_vertex.x - 0.5), f_vertex.y - floor(f_vertex.y - 0.5), f_vertex.z - floor(f_vertex.z - 0.5)); + finalColor.a = (u_renderError > 0.5) && dot(grid, grid) < 0.245 ? 0.667 : 1.0; + gl_FragColor = finalColor; } @@ -144,11 +142,8 @@ fragment41core = finalColor = (u_faceId != gl_PrimitiveID) ? ((-normal.y > u_overhangAngle) ? u_overhangColor : finalColor) : u_faceColor; frag_color = finalColor; - if(u_renderError > 0.5) - { - vec3 grid = f_vertex - round(f_vertex); - frag_color.a = dot(grid, grid) < 0.245 ? 0.667 : 1.0; - } + vec3 grid = f_vertex - round(f_vertex); + frag_color.a = (u_renderError > 0.5) && dot(grid, grid) < 0.245 ? 0.667 : 1.0; } [defaults]