From 0e20e349f13ea073fe8e9b447eb3e79a11e0f44d Mon Sep 17 00:00:00 2001 From: Matias Pierdomenico Date: Thu, 14 Nov 2019 20:32:54 -0300 Subject: Changed variable name in shader because it was too generic --- servers/visual/rasterizer_rd/shaders/canvas.glsl | 2 +- servers/visual/rasterizer_rd/shaders/canvas_uniforms_inc.glsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'servers/visual/rasterizer_rd') diff --git a/servers/visual/rasterizer_rd/shaders/canvas.glsl b/servers/visual/rasterizer_rd/shaders/canvas.glsl index 7c0b82065a..63f3ca1c08 100644 --- a/servers/visual/rasterizer_rd/shaders/canvas.glsl +++ b/servers/visual/rasterizer_rd/shaders/canvas.glsl @@ -439,7 +439,7 @@ FRAGMENT_SHADER_CODE light_base >>= (i & 3) * 8; light_base &= 0xFF; - vec2 tex_uv = (vec4(vertex, 0.0, 1.0) * mat4(light_array.data[light_base].matrix[0], light_array.data[light_base].matrix[1], vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0))).xy; //multiply inverse given its transposed. Optimizer removes useless operations. + vec2 tex_uv = (vec4(vertex, 0.0, 1.0) * mat4(light_array.data[light_base].texture_matrix[0], light_array.data[light_base].texture_matrix[1], vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0))).xy; //multiply inverse given its transposed. Optimizer removes useless operations. vec4 light_color = texture(sampler2D(light_textures[i], texture_sampler), tex_uv); vec4 light_base_color = light_array.data[light_base].color; diff --git a/servers/visual/rasterizer_rd/shaders/canvas_uniforms_inc.glsl b/servers/visual/rasterizer_rd/shaders/canvas_uniforms_inc.glsl index bd4dd47eff..73a0f6ffe4 100644 --- a/servers/visual/rasterizer_rd/shaders/canvas_uniforms_inc.glsl +++ b/servers/visual/rasterizer_rd/shaders/canvas_uniforms_inc.glsl @@ -104,7 +104,7 @@ layout(set = 2, binding = 2, std140) uniform SkeletonData { #define LIGHT_FLAGS_SHADOW_PCF13 (2 << 22) struct Light { - mat2x4 matrix; //light to texture coordinate matrix (transposed) + mat2x4 texture_matrix; //light to texture coordinate matrix (transposed) mat2x4 shadow_matrix; //light to shadow coordinate matrix (transposed) vec4 color; vec4 shadow_color; -- cgit v1.2.3