noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #115152 from clayjohn/RD-ninepatch-precision

Browse Source 
Increase precision of ninepatch source rect to ensure pixel perfect alignment
This commit is contained in:
Rémi Verschelde
2026-01-20 00:22:44 +01:00
parent aa6ab2660f c5d21df245
commit dc57cd698d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
View File

@@ -1840,7 +1840,7 @@ RendererCanvasRenderRD::RendererCanvasRenderRD() {
actions.base_uniform_string = "material.";
actions.default_filter = ShaderLanguage::FILTER_LINEAR;
actions.default_repeat = ShaderLanguage::REPEAT_DISABLE;
actions.base_varying_index = 8;
actions.base_varying_index = 9;
actions.global_buffer_array_variable = "global_shader_uniforms.data";
actions.instance_uniform_index_variable = "read_draw_data_instance_offset";

13
servers/rendering/renderer_rd/shaders/canvas.glsl
View File

@@ -36,7 +36,8 @@ layout(location = 4) out flat uvec4 varying_C;
#ifdef USE_NINEPATCH
layout(location = 5) out flat vec4 varying_D;
layout(location = 6) out flat vec4 varying_E;
layout(location = 7) out vec2 pixel_size_interp;
layout(location = 7) out flat vec4 varying_F;
layout(location = 8) out vec2 pixel_size_interp;
#endif // USE_NINEPATCH
#endif // !USE_ATTRIBUTES
@@ -131,6 +132,7 @@ void main() {
#ifdef USE_NINEPATCH
varying_D = read_draw_data_ninepatch_margins;
varying_E = vec4(read_draw_data_dst_rect.z, read_draw_data_dst_rect.w, read_draw_data_ninepatch_pixel_size.x, read_draw_data_ninepatch_pixel_size.y);
varying_F = read_draw_data_src_rect;
#endif // USE_NINEPATCH
#endif // !USE_ATTRIBUTES
@@ -339,11 +341,14 @@ layout(location = 4) in flat uvec4 varying_C;
#ifdef USE_NINEPATCH
layout(location = 5) in flat vec4 varying_D;
layout(location = 6) in flat vec4 varying_E;
layout(location = 7) in vec2 pixel_size_interp;
layout(location = 7) in flat vec4 varying_F;
layout(location = 8) in vec2 pixel_size_interp;
#define read_draw_data_ninepatch_margins varying_D
#define read_draw_data_dst_rect_z varying_E.x
#define read_draw_data_dst_rect_w varying_E.y
#define read_draw_data_ninepatch_pixel_size (varying_E.zw)
#define read_draw_data_src_rect_ninepatch (varying_F);
#endif // USE_NINEPATCH
#endif // USE_ATTRIBUTES
@@ -586,7 +591,9 @@ void main() {
color.a = 0.0;
}
uv = uv * src_rect.zw + src_rect.xy; //apply region if needed
vec4 ninepatch_src_rect = read_draw_data_src_rect_ninepatch;
uv = uv * ninepatch_src_rect.zw + ninepatch_src_rect.xy; //apply region if needed
#endif
if (bool(read_draw_data_flags & INSTANCE_FLAGS_CLIP_RECT_UV)) {