godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97217 from stuartcarnie/97185_subpixel_rendering 

Metal: Fix subpixel blending; fix inconsistent blend state
This commit is contained in:
Rémi Verschelde 2024-09-20 16:07:03 +02:00
parent 25c4caa5d7 e826ab9ba9
commit 34dd5e0c37
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/metal/metal_objects.h
View File

@ -318,6 +318,13 @@ public:
dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS); dirty.set_flag(DirtyFlag::DIRTY_UNIFORMS);
} }
_FORCE_INLINE_ void mark_blend_dirty() {
if (!blend_constants.has_value()) {
return;
}
dirty.set_flag(DirtyFlag::DIRTY_BLEND);
}
MTLScissorRect clip_to_render_area(MTLScissorRect p_rect) const { MTLScissorRect clip_to_render_area(MTLScissorRect p_rect) const {
uint32_t raLeft = render_area.position.x; uint32_t raLeft = render_area.position.x;
uint32_t raRight = raLeft + render_area.size.width; uint32_t raRight = raLeft + render_area.size.width;

4
drivers/metal/metal_objects.mm
View File

@ -143,6 +143,9 @@ void MDCommandBuffer::bind_pipeline(RDD::PipelineID p_pipeline) {
if (render.pipeline != nullptr && render.pipeline->depth_stencil != rp->depth_stencil) { if (render.pipeline != nullptr && render.pipeline->depth_stencil != rp->depth_stencil) {
render.dirty.set_flag(RenderState::DIRTY_DEPTH); render.dirty.set_flag(RenderState::DIRTY_DEPTH);
} }
if (rp->raster_state.blend.enabled) {
render.dirty.set_flag(RenderState::DIRTY_BLEND);
}
render.pipeline = rp; render.pipeline = rp;
} }
} else if (p->type == MDPipelineType::Compute) { } else if (p->type == MDPipelineType::Compute) {
@ -301,6 +304,7 @@ void MDCommandBuffer::render_clear_attachments(VectorView<RDD::AttachmentClear>
render.mark_viewport_dirty(); render.mark_viewport_dirty();
render.mark_scissors_dirty(); render.mark_scissors_dirty();
render.mark_vertex_dirty(); render.mark_vertex_dirty();
render.mark_blend_dirty();
} }
void MDCommandBuffer::_render_set_dirty_state() { void MDCommandBuffer::_render_set_dirty_state() {

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

@ -2479,6 +2479,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->command_type = Item::Command::TYPE_NINEPATCH; r_current_batch->command_type = Item::Command::TYPE_NINEPATCH;
r_current_batch->command = c; r_current_batch->command = c;
r_current_batch->has_blend = false;
r_current_batch->pipeline_variant = PipelineVariant::PIPELINE_VARIANT_NINEPATCH; r_current_batch->pipeline_variant = PipelineVariant::PIPELINE_VARIANT_NINEPATCH;
} }
@ -2548,6 +2549,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->command_type = Item::Command::TYPE_POLYGON; r_current_batch->command_type = Item::Command::TYPE_POLYGON;
r_current_batch->has_blend = false;
r_current_batch->command = c; r_current_batch->command = c;
TextureState tex_state(polygon->texture, texture_filter, texture_repeat, false, use_linear_colors); TextureState tex_state(polygon->texture, texture_filter, texture_repeat, false, use_linear_colors);
@ -2585,6 +2587,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
if (primitive->point_count != r_current_batch->primitive_points || r_current_batch->command_type != Item::Command::TYPE_PRIMITIVE) { if (primitive->point_count != r_current_batch->primitive_points || r_current_batch->command_type != Item::Command::TYPE_PRIMITIVE) {
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->command_type = Item::Command::TYPE_PRIMITIVE; r_current_batch->command_type = Item::Command::TYPE_PRIMITIVE;
r_current_batch->has_blend = false;
r_current_batch->command = c; r_current_batch->command = c;
r_current_batch->primitive_points = primitive->point_count; r_current_batch->primitive_points = primitive->point_count;
@ -2646,6 +2649,7 @@ void RendererCanvasRenderRD::_record_item_commands(const Item *p_item, RenderTar
r_current_batch = _new_batch(r_batch_broken); r_current_batch = _new_batch(r_batch_broken);
r_current_batch->command = c; r_current_batch->command = c;
r_current_batch->command_type = c->type; r_current_batch->command_type = c->type;
r_current_batch->has_blend = false;
InstanceData *instance_data = nullptr; InstanceData *instance_data = nullptr;
@ -2799,6 +2803,7 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, PipelineV
RID pipeline = p_pipeline_variants->variants[p_batch->light_mode][p_batch->pipeline_variant].get_render_pipeline(RD::INVALID_ID, p_framebuffer_format); RID pipeline = p_pipeline_variants->variants[p_batch->light_mode][p_batch->pipeline_variant].get_render_pipeline(RD::INVALID_ID, p_framebuffer_format);
RD::get_singleton()->draw_list_bind_render_pipeline(p_draw_list, pipeline); RD::get_singleton()->draw_list_bind_render_pipeline(p_draw_list, pipeline);
if (p_batch->has_blend) { if (p_batch->has_blend) {
DEV_ASSERT(p_batch->pipeline_variant == PIPELINE_VARIANT_QUAD_LCD_BLEND);
RD::get_singleton()->draw_list_set_blend_constants(p_draw_list, p_batch->modulate); RD::get_singleton()->draw_list_set_blend_constants(p_draw_list, p_batch->modulate);
} }