diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-18 19:24:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-18 19:24:38 +0100 |
commit | ef24e95f4ae445ec427832f9d23e47c7b1cf5d76 (patch) | |
tree | 5e6b4f584fe6e8454ef5e47df4ab0f7db9b97554 /servers/rendering/renderer_rd/shaders/canvas.glsl | |
parent | 9c231c2c1a8ca11939bb4f2c3dddf4b4f82d93df (diff) | |
parent | 0d9aecd96760ad85930cced7a40c0e6c3c19f3dc (diff) |
Merge pull request #59268 from Chaosus/shader_renames2
Rename several transform built-ins in shaders
Diffstat (limited to 'servers/rendering/renderer_rd/shaders/canvas.glsl')
-rw-r--r-- | servers/rendering/renderer_rd/shaders/canvas.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/rendering/renderer_rd/shaders/canvas.glsl b/servers/rendering/renderer_rd/shaders/canvas.glsl index 65a621b203..fbc641ee9e 100644 --- a/servers/rendering/renderer_rd/shaders/canvas.glsl +++ b/servers/rendering/renderer_rd/shaders/canvas.glsl @@ -82,7 +82,7 @@ void main() { #endif - mat4 world_matrix = mat4(vec4(draw_data.world_x, 0.0, 0.0), vec4(draw_data.world_y, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(draw_data.world_ofs, 0.0, 1.0)); + mat4 model_matrix = mat4(vec4(draw_data.world_x, 0.0, 0.0), vec4(draw_data.world_y, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(draw_data.world_ofs, 0.0, 1.0)); #define FLAGS_INSTANCING_MASK 0x7F #define FLAGS_INSTANCING_HAS_COLORS (1 << 7) @@ -156,7 +156,7 @@ void main() { } matrix = transpose(matrix); - world_matrix = world_matrix * matrix; + model_matrix = model_matrix * matrix; } } @@ -179,7 +179,7 @@ void main() { #endif #if !defined(SKIP_TRANSFORM_USED) - vertex = (world_matrix * vec4(vertex, 0.0, 1.0)).xy; + vertex = (model_matrix * vec4(vertex, 0.0, 1.0)).xy; #endif color_interp = color; |