From b05caa8bdc797c1526a4263d792402ac9903e9ae Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 19 Sep 2016 17:15:22 +0200 Subject: [PATCH] Remove unused uniforms from composite shaders CURA-2299 --- plugins/LayerView/layerview_composite.shader | 18 +++++++----------- plugins/XRayView/xray_composite.shader | 5 ----- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/plugins/LayerView/layerview_composite.shader b/plugins/LayerView/layerview_composite.shader index afa7f0ee39..61d61bb901 100644 --- a/plugins/LayerView/layerview_composite.shader +++ b/plugins/LayerView/layerview_composite.shader @@ -16,10 +16,6 @@ fragment = uniform sampler2D u_layer0; uniform sampler2D u_layer1; uniform sampler2D u_layer2; - uniform sampler2D u_layer3; - - uniform float u_imageWidth; - uniform float u_imageHeight; uniform vec2 u_offset[9]; @@ -42,11 +38,13 @@ fragment = kernel[6] = 0.0; kernel[7] = 1.0; kernel[8] = 0.0; vec4 result = u_background_color; - vec4 layer0 = texture2D(u_layer0, v_uvs); - vec4 layer2 = texture2D(u_layer2, v_uvs); - result = layer0 * layer0.a + result * (1.0 - layer0.a); - result = layer2 * layer2.a + result * (1.0 - layer2.a); + vec4 main_layer = texture2D(u_layer0, v_uvs); + vec4 selection_layer = texture2D(u_layer1, v_uvs); + vec4 layerview_layer = texture2D(u_layer2, v_uvs); + + result = main_layer * main_layer.a + result * (1.0 - main_layer.a); + result = layerview_layer * layerview_layer.a + result * (1.0 - layerview_layer.a); vec4 sum = vec4(0.0); for (int i = 0; i < 9; i++) @@ -55,8 +53,7 @@ fragment = sum += color * (kernel[i] / u_outline_strength); } - vec4 layer1 = texture2D(u_layer1, v_uvs); - if((layer1.rgb == x_axis || layer1.rgb == y_axis || layer1.rgb == z_axis)) + if((selection_layer.rgb == x_axis || selection_layer.rgb == y_axis || selection_layer.rgb == z_axis)) { gl_FragColor = result; } @@ -70,7 +67,6 @@ fragment = u_layer0 = 0 u_layer1 = 1 u_layer2 = 2 -u_layer3 = 3 u_background_color = [0.965, 0.965, 0.965, 1.0] u_outline_strength = 1.0 u_outline_color = [0.05, 0.66, 0.89, 1.0] diff --git a/plugins/XRayView/xray_composite.shader b/plugins/XRayView/xray_composite.shader index 40febb730c..cdd3509e32 100644 --- a/plugins/XRayView/xray_composite.shader +++ b/plugins/XRayView/xray_composite.shader @@ -16,10 +16,6 @@ fragment = uniform sampler2D u_layer0; uniform sampler2D u_layer1; uniform sampler2D u_layer2; - uniform sampler2D u_layer3; - - uniform float u_imageWidth; - uniform float u_imageHeight; uniform vec2 u_offset[9]; @@ -62,7 +58,6 @@ fragment = u_layer0 = 0 u_layer1 = 1 u_layer2 = 2 -u_layer3 = 3 u_outline_strength = 1.0 u_outline_color = [0.05, 0.66, 0.89, 1.0] u_error_color = [1.0, 0.0, 0.0, 1.0]