godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Merge pull request #112131 from stuartcarnie/fix_2d_ui

Browse Source 
2D: Fix incorrect 2D rendering
This commit is contained in:
Thaddeus Crews
2025-10-29 13:13:49 -05:00
parent 881058009f 7db9be5685
commit 84e713c6c1
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2387,11 +2387,9 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
if (r_current_batch->tex_info != tex_info) { if (r_current_batch->tex_info != tex_info) {
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width;
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
} }
InstanceData *instance_data = new_instance_data(template_instance); InstanceData *instance_data = new_instance_data(*r_current_batch, template_instance);
Rect2 src_rect; Rect2 src_rect;
Rect2 dst_rect; Rect2 dst_rect;
@@ -2490,11 +2488,9 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
if (r_current_batch->tex_info != tex_info) { if (r_current_batch->tex_info != tex_info) {
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width;
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
} }
InstanceData *instance_data = new_instance_data(template_instance); InstanceData *instance_data = new_instance_data(*r_current_batch, template_instance);
Rect2 src_rect; Rect2 src_rect;
Rect2 dst_rect(np->rect.position.x, np->rect.position.y, np->rect.size.x, np->rect.size.y); Rect2 dst_rect(np->rect.position.x, np->rect.position.y, np->rect.size.x, np->rect.size.y);
@@ -2567,8 +2563,6 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
if (r_current_batch->tex_info != tex_info) { if (r_current_batch->tex_info != tex_info) {
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width;
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
} }
// pipeline variant // pipeline variant
@@ -2578,7 +2572,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
r_current_batch->render_primitive = _primitive_type_to_render_primitive(polygon->primitive); r_current_batch->render_primitive = _primitive_type_to_render_primitive(polygon->primitive);
} }
InstanceData *instance_data = new_instance_data(template_instance); InstanceData *instance_data = new_instance_data(*r_current_batch, template_instance);
Color color = base_color; Color color = base_color;
if (use_linear_colors) { if (use_linear_colors) {
@@ -2636,11 +2630,9 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
if (r_current_batch->tex_info != tex_info) { if (r_current_batch->tex_info != tex_info) {
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width;
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
} }
InstanceData *instance_data = new_instance_data(template_instance); InstanceData *instance_data = new_instance_data(*r_current_batch, template_instance);
for (uint32_t j = 0; j < MIN(3u, primitive->point_count); j++) { for (uint32_t j = 0; j < MIN(3u, primitive->point_count); j++) {
instance_data->points[j * 2 + 0] = primitive->points[j].x; instance_data->points[j * 2 + 0] = primitive->points[j].x;
@@ -2658,7 +2650,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
_add_to_batch(r_batch_broken, r_current_batch); _add_to_batch(r_batch_broken, r_current_batch);
if (primitive->point_count == 4) { if (primitive->point_count == 4) {
instance_data = new_instance_data(template_instance); instance_data = new_instance_data(*r_current_batch, template_instance);
for (uint32_t j = 0; j < 3; j++) { for (uint32_t j = 0; j < 3; j++) {
int offset = j == 0 ? 0 : 1; int offset = j == 0 ? 0 : 1;
@@ -2701,9 +2693,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
_prepare_batch_texture_info(m->texture, tex_state, tex_info); _prepare_batch_texture_info(m->texture, tex_state, tex_info);
} }
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width; instance_data = new_instance_data(*r_current_batch, template_instance);
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
instance_data = new_instance_data(template_instance);
r_current_batch->mesh_instance_count = 1; r_current_batch->mesh_instance_count = 1;
_update_transform_2d_to_mat2x3(base_transform * draw_transform * m->transform, instance_data->world); _update_transform_2d_to_mat2x3(base_transform * draw_transform * m->transform, instance_data->world);
@@ -2730,9 +2720,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
_prepare_batch_texture_info(mm->texture, tex_state, tex_info); _prepare_batch_texture_info(mm->texture, tex_state, tex_info);
} }
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width; instance_data = new_instance_data(*r_current_batch, template_instance);
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
instance_data = new_instance_data(template_instance);
r_current_batch->flags |= 1; // multimesh, trails disabled r_current_batch->flags |= 1; // multimesh, trails disabled
@@ -2754,9 +2742,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
_prepare_batch_texture_info(pt->texture, tex_state, tex_info); _prepare_batch_texture_info(pt->texture, tex_state, tex_info);
} }
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width; instance_data = new_instance_data(*r_current_batch, template_instance);
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
instance_data = new_instance_data(template_instance);
uint32_t divisor = 1; uint32_t divisor = 1;
r_current_batch->mesh_instance_count = particles_storage->particles_get_amount(pt->particles, divisor); r_current_batch->mesh_instance_count = particles_storage->particles_get_amount(pt->particles, divisor);
@@ -2877,12 +2863,10 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
if (r_current_batch->tex_info != tex_info) { if (r_current_batch->tex_info != tex_info) {
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->tex_info = tex_info; r_current_batch->tex_info = tex_info;
template_instance.color_texture_pixel_size[0] = tex_info->texpixel_size.width;
template_instance.color_texture_pixel_size[1] = tex_info->texpixel_size.height;
} }
_update_transform_2d_to_mat2x3(base_transform, template_instance.world); _update_transform_2d_to_mat2x3(base_transform, template_instance.world);
InstanceData *instance_data = new_instance_data(template_instance); InstanceData *instance_data = new_instance_data(*r_current_batch, template_instance);
Rect2 src_rect; Rect2 src_rect;
Rect2 dst_rect; Rect2 dst_rect;
@@ -3165,11 +3149,13 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
} }
} }
RendererCanvasRenderRD::InstanceData *RendererCanvasRenderRD::new_instance_data(const InstanceData &template_instance) { RendererCanvasRenderRD::InstanceData *RendererCanvasRenderRD::new_instance_data(Batch &p_current_batch, const InstanceData &template_instance) {
DEV_ASSERT(state.instance_data != nullptr); DEV_ASSERT(state.instance_data != nullptr);
InstanceData *instance_data = &state.instance_data[state.instance_data_index]; InstanceData *instance_data = &state.instance_data[state.instance_data_index];
memcpy(instance_data, &template_instance, sizeof(InstanceData)); memcpy(instance_data, &template_instance, sizeof(InstanceData));
instance_data->color_texture_pixel_size[0] = p_current_batch.tex_info->texpixel_size.width;
instance_data->color_texture_pixel_size[1] = p_current_batch.tex_info->texpixel_size.height;
return instance_data; return instance_data;
} }

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

@@ -626,7 +626,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
void _prepare_batch_texture_info(RID p_texture, TextureState &p_state, TextureInfo *p_info); void _prepare_batch_texture_info(RID p_texture, TextureState &p_state, TextureInfo *p_info);
// non-UMA // non-UMA
InstanceData *new_instance_data(const InstanceData &template_instance); InstanceData *new_instance_data(Batch &p_current_batch, const InstanceData &template_instance);
[[nodiscard]] Batch *_new_batch(bool &r_batch_broken); [[nodiscard]] Batch *_new_batch(bool &r_batch_broken);
void _add_to_batch(bool &r_batch_broken, Batch *&r_current_batch); void _add_to_batch(bool &r_batch_broken, Batch *&r_current_batch);
void _allocate_instance_buffer(); void _allocate_instance_buffer();